no message

demo/src/main/java/com/yyxxgame/columbus/DemoActivity.kt

@@ -1,15 +1,18 @@
 package com.yyxxgame.columbus
 
 import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.Message
+import android.view.KeyEvent
 import android.view.View
 import android.widget.*
 import cn.yyxx.columbus.base.Columbus
 import cn.yyxx.columbus.base.internal.ICallback
 import cn.yyxx.support.hawkeye.LogUtils
+import kotlin.system.exitProcess
 
 
 /**
@@ -115,5 +118,59 @@ class DemoActivity : Activity(), View.OnClickListener {
         }
     }
 
+    override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            Columbus.getInstance().openExitView(this, object : ICallback {
+                override fun onResult(code: Int, result: String) {
+                    if (code == 0) {
+                        finish()
+                    }
+                }
+            })
+            return true
+        }
+        return super.onKeyDown(keyCode, event)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        Columbus.getInstance().onStart(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        Columbus.getInstance().onResume(this)
+    }
+
+    override fun onRestart() {
+        super.onRestart()
+        Columbus.getInstance().onRestart(this)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        Columbus.getInstance().onPause(this)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        Columbus.getInstance().onStop(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Columbus.getInstance().onDestroy(this)
+        exitProcess(0)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
+        super.onActivityResult(requestCode, resultCode, data)
+        Columbus.getInstance().onActivityResult(this, requestCode, resultCode, data)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        Columbus.getInstance().onNewIntent(this, intent)
+    }
 
 }

library_base/src/main/java/cn/yyxx/columbus/base/utils/Logger.kt

@@ -32,11 +32,11 @@ object Logger {
             //缓存日志最低等级
             .setRecordLevel(Level.DEBUG)
             //是否开启压缩缓存日志内容
-            .setCompressEnable(true)
+            .setCompressEnable(false)
             //缓存文件的过期时间
             .setOverdueDay(3)
             //缓存文件大小限制，超过则会自动扩容新文件
-            .setFileSizeLimitDay(15)
+            .setFileSizeLimitDay(10)
             .create()
         Zap.initialize(application, config)
         hasZapInit = true

library_core/src/main/java/cn/yyxx/columbus/core/impl/SdkBridgeImpl.kt

@@ -19,7 +19,9 @@ import cn.yyxx.columbus.core.internal.IImplCallback
 import cn.yyxx.columbus.core.internal.IRequestCallback
 import cn.yyxx.columbus.core.network.Host
 import cn.yyxx.columbus.core.network.SdkRequest
+import cn.yyxx.columbus.core.ui.dialog.TipsDialog
 import cn.yyxx.columbus.core.utils.MMKVUtils
+import cn.yyxx.support.ResUtils
 import cn.yyxx.support.gaid.GAIDUtils
 import cn.yyxx.support.hawkeye.LogUtils
 import cn.yyxx.support.hawkeye.OwnDebugUtils
@@ -54,6 +56,8 @@ class SdkBridgeImpl(context: Context) {
     @Volatile
     private var timeCount = AtomicInteger(0)
 
+    private var exitDialog: TipsDialog? = null
+
     init {
         Host.initHostModel(context)
         LogUtils.DEBUG = OwnDebugUtils.isOwnDebug(context, "yyxx_cfg.properties", "yyxx_game", "YYXX_OWN_DEBUG")
@@ -141,7 +145,6 @@ class SdkBridgeImpl(context: Context) {
         SdkRequest.getInstance().initSdk(activity, object : IRequestCallback {
             override fun onResponse(resultInfo: ResultInfo) {
                 if (resultInfo.code == 1 && !TextUtils.isEmpty(resultInfo.data)) {
-                    Logger.d(resultInfo.data)
                     initBean = InitBean.toBean(resultInfo.data)
                     //TODO 下载图片资源
                     showInitDialog(activity, callback, initCallback)
@@ -240,7 +243,32 @@ class SdkBridgeImpl(context: Context) {
     }
 
     fun openExitView(activity: Activity, callback: ICallback) {
+        exitDialog?.apply {
+            dismiss()
+            exitDialog = null
+        }
 
+        exitDialog = TipsDialog(activity, true)
+        exitDialog?.apply {
+            textView.text = ResUtils.getResString(activity, "yyxx_tv_exit_content")
+            leftButton.text = ResUtils.getResString(activity, "yyxx_tv_exit_left")
+            leftButton.setOnClickListener {
+                if (isShowing) {
+                    dismiss()
+                    exitDialog = null
+                }
+                callback.onResult(0, "退出游戏")
+            }
+            rightButton.text = ResUtils.getResString(activity, "yyxx_tv_exit_right")
+            rightButton.setOnClickListener {
+                if (isShowing) {
+                    dismiss()
+                    exitDialog = null
+                }
+                callback.onResult(-1, "继续游戏")
+            }
+            show()
+        }
     }
 
     fun onStart(activity: Activity) {

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/UserSignInImpl.kt

@@ -159,9 +159,9 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
                             val jsonObject = JSONObject(resultInfo.data)
                             SdkBackLoginInfo.instance.userId = jsonObject.getString("uid")
                             SdkBackLoginInfo.instance.token = jsonObject.getString("token")
-                            SdkBackLoginInfo.instance.isRegUser = jsonObject.getInt("is_reg_user") == 1
-                            SdkBackLoginInfo.instance.hasBindAccount = jsonObject.getInt("has_bind_account") == 1
-                            SdkBackLoginInfo.instance.hasBindPhone = jsonObject.getInt("has_bind_phone") == 1
+                            SdkBackLoginInfo.instance.isRegUser = true
+                            SdkBackLoginInfo.instance.hasBindAccount = false
+                            SdkBackLoginInfo.instance.hasBindPhone = false
                             SdkBackLoginInfo.instance.loginType = LoginType.TYPE_ACCOUNT_LOGIN
 
                             with(Session()) {

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/fragment/LauncherFragment.kt

@@ -4,6 +4,7 @@ import android.content.DialogInterface
 import android.graphics.Color
 import android.os.Bundle
 import android.text.InputType
+import android.text.TextUtils
 import android.view.*
 import android.widget.*
 import androidx.fragment.app.Fragment
@@ -16,8 +17,10 @@ import cn.yyxx.columbus.core.impl.login.LoginActivity
 import cn.yyxx.columbus.core.ui.EventEditText
 import cn.yyxx.columbus.core.ui.dialog.AgreementDialog
 import cn.yyxx.columbus.core.ui.dialog.ForgetPwdDialog
+import cn.yyxx.columbus.core.utils.EditTextUtils
 import cn.yyxx.columbus.core.utils.SessionUtils
 import cn.yyxx.support.ResUtils
+import cn.yyxx.support.hawkeye.ToastUtils
 
 /**
  * @author #Suyghur.
@@ -120,7 +123,7 @@ class LauncherFragment : Fragment(), View.OnClickListener {
 
         ivCheck = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_iv_check", "id"))
         tvAgreement = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_tv_agreement", "id"))
-        if (SdkBridgeImpl.initBean.privacyCfg.switch == 0) {
+        if (SdkBridgeImpl.initBean.privacyCfg.switch == 0 || TextUtils.isEmpty(SdkBridgeImpl.initBean.privacyCfg.url)) {
             ivCheck.visibility = View.GONE
             tvAgreement.visibility = View.GONE
         } else {
@@ -308,6 +311,24 @@ class LauncherFragment : Fragment(), View.OnClickListener {
                 }
 
             })
+            btnConfirm.setOnClickListener {
+                val userName = eetAccount.editText.text.trim().toString()
+                val phoneNum = eetPhone.editText.text.trim().toString()
+
+                if (!EditTextUtils.filterAccount(userName)) {
+                    ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_account_format_error"))
+                    return@setOnClickListener
+                }
+                if (!EditTextUtils.filterPhone(phoneNum)) {
+                    ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_phone_format_error"))
+                    return@setOnClickListener
+                }
+                if (TextUtils.isEmpty(code)) {
+                    ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_area_code_format_error"))
+                    return@setOnClickListener
+                }
+                invokeForgetPwd()
+            }
             show()
         }
     }
@@ -338,17 +359,25 @@ class LauncherFragment : Fragment(), View.OnClickListener {
         }
     }
 
+    private fun invokeForgetPwd() {
+
+    }
+
     override fun onClick(v: View?) {
         v?.apply {
             when (tag as Int) {
                 ClickType.ACTION_FORGET -> showForgetPwdDialog()
                 ClickType.ACTION_LAUNCHER -> {
-//                    val jsonObject = JSONObject()
-//                    jsonObject.put("login_type", LoginType.TYPE_ACCOUNT_LOGIN)
-//                    jsonObject.put("uname", eetAccount.editText.text)
-//                    jsonObject.put("pwd", eetPwd.editText.text)
                     val userName = eetAccount.editText.text.trim().toString()
                     val pwd = eetPwd.editText.text.trim().toString()
+                    if (!EditTextUtils.filterAccount(userName)) {
+                        ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_account_format_error"))
+                        return
+                    }
+                    if (!EditTextUtils.filterPwd(pwd)) {
+                        ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_pwd_format_error"))
+                        return
+                    }
                     loginImpl.userSignInImpl.accountLogin(requireActivity(), userName, pwd)
                 }
                 ClickType.ACTION_CLICK_CHECK -> changeCheck()

library_core/src/main/java/cn/yyxx/columbus/core/impl/login/fragment/RegisterFragment.kt

@@ -3,6 +3,7 @@ package cn.yyxx.columbus.core.impl.login.fragment
 import android.content.DialogInterface
 import android.os.Bundle
 import android.text.InputType
+import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
@@ -16,7 +17,9 @@ import cn.yyxx.columbus.core.impl.SdkBridgeImpl
 import cn.yyxx.columbus.core.impl.login.LoginActivity
 import cn.yyxx.columbus.core.ui.EventEditText
 import cn.yyxx.columbus.core.ui.dialog.AgreementDialog
+import cn.yyxx.columbus.core.utils.EditTextUtils
 import cn.yyxx.support.ResUtils
+import cn.yyxx.support.hawkeye.ToastUtils
 import org.json.JSONException
 
 /**
@@ -94,7 +97,7 @@ class RegisterFragment : Fragment(), View.OnClickListener {
 
         ivCheck = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_iv_check", "id"))
         tvAgreement = view.findViewById(ResUtils.getResId(requireActivity(), "yyxx_tv_agreement", "id"))
-        if (SdkBridgeImpl.initBean.privacyCfg.switch == 0) {
+        if (SdkBridgeImpl.initBean.privacyCfg.switch == 0 || TextUtils.isEmpty(SdkBridgeImpl.initBean.privacyCfg.url)) {
             ivCheck.visibility = View.GONE
             tvAgreement.visibility = View.GONE
         } else {
@@ -164,6 +167,14 @@ class RegisterFragment : Fragment(), View.OnClickListener {
                     try {
                         val userName = eetAccount.editText.text.trim().toString()
                         val pwd = eetPwd.editText.text.trim().toString()
+                        if (!EditTextUtils.filterAccount(userName)) {
+                            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_account_format_error"))
+                            return
+                        }
+                        if (!EditTextUtils.filterPwd(pwd)) {
+                            ToastUtils.toastInfo(requireActivity(), ResUtils.getResString(requireActivity(), "yyxx_tips_pwd_format_error"))
+                            return
+                        }
                         loginImpl.userSignInImpl.userRegister(requireActivity(), userName, pwd)
                     } catch (e: JSONException) {
                         e.printStackTrace()

library_core/src/main/java/cn/yyxx/columbus/core/network/SdkRequest.kt

@@ -41,17 +41,9 @@ class SdkRequest {
         VolleyRequest.post(context, Host.HOST, jsonObject, callback)
     }
 
-    fun userVerifyThirdPart(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
-        try {
-            jsonObject.put("route_path", Host.BASIC_ROUTE_THIRD_PART_LOGIN)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        VolleyRequest.post(context, Host.HOST, jsonObject, callback)
-    }
-
     fun registerUser(context: Context, jsonObject: JSONObject, callback: IRequestCallback) {
         try {
+            jsonObject.put("common", getCommon(context))
             jsonObject.put("route_path", Host.BASIC_ROUTE_REGISTER)
         } catch (e: Exception) {
             e.printStackTrace()

library_core/src/main/java/cn/yyxx/columbus/core/network/VolleyRequest.kt

@@ -39,6 +39,8 @@ object VolleyRequest {
             val obj = JSONObject()
             obj.put("p", p)
             obj.put("ts", rawKey)
+            Logger.d(obj.toString())
+            //TODO 拉起登录接口时会莫名其妙ANR，后续再排查
 //            val json = SdkDrive.invokeJob(context, jsonObject.toString())
 //            val obj = JSONObject(json)
 //            //因为native c++中aes加密后生成的base64字符串可能会因为\0的原因被截断，所以使用hex进行编码

library_core/src/main/java/cn/yyxx/columbus/core/ui/dialog/AgreementDialog.kt

@@ -8,9 +8,9 @@ import android.view.*
 import android.webkit.CookieSyncManager
 import android.webkit.WebSettings
 import android.webkit.WebView
+import android.webkit.WebViewClient
 import android.widget.FrameLayout
 import android.widget.ImageView
-import cn.yyxx.columbus.core.entity.ClickType
 import cn.yyxx.support.DensityUtils
 import cn.yyxx.support.ResUtils
 import cn.yyxx.support.device.DeviceInfoUtils
@@ -84,6 +84,21 @@ class AgreementDialog constructor(context: Context, url: String, val isLandscape
             //这种写法可以正确解码
             webView.loadData("网络异常,请检查重试", "text/html; charset=UTF-8", null)
         }
+
+        webView.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                if (url.startsWith("http:") || url.startsWith("https:")) {
+                    if (!view.canGoBack()) {
+                        return false
+                    }
+                    if (view.hitTestResult.type == WebView.HitTestResult.UNKNOWN_TYPE) {
+                        return false
+                    }
+                    view.loadUrl(url)
+                }
+                return false
+            }
+        }
     }
 
 }

library_core/src/main/java/cn/yyxx/columbus/core/ui/dialog/ForgetPwdDialog.kt

@@ -32,6 +32,9 @@ class ForgetPwdDialog(context: Context, private val isLandscape: Boolean, val ar
     private var imgUp = 0
     private var imgDown = 0
 
+    var code = ""
+        private set
+
     init {
         setCanceledOnTouchOutside(false)
         window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
@@ -139,6 +142,7 @@ class ForgetPwdDialog(context: Context, private val isLandscape: Boolean, val ar
                     val tvAreaCode = findViewById<TextView>(ResUtils.getResId(context, "yyxx_tv_area", "id"))
                     tvAreaCode.gravity = Gravity.CENTER
                     tvAreaCode.text = areaCode
+                    code = areaCode
                     setOnClickListener(OnItemClick(areaCode))
                     layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, height)
                     llAreaList.addView(this, llAreaList.childCount)

library_core/src/main/java/cn/yyxx/columbus/core/ui/dialog/TipsDialog.kt

@@ -0,0 +1,61 @@
+package cn.yyxx.columbus.core.ui.dialog
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.view.*
+import android.widget.Button
+import android.widget.TextView
+import cn.yyxx.support.ResUtils
+
+/**
+ * 提示框dialog
+ * 样式如下：
+ * -------------------------
+ * |                       |
+ * |                       |
+ * ｜         内容          ｜
+ * ｜                      ｜
+ * -------------------------
+ * ｜    取消    ｜   确定   ｜
+ * -------------------------
+ * @author #Suyghur.
+ * Created on 2020/12/10
+ */
+class TipsDialog(context: Context, doubleButton: Boolean) : Dialog(context) {
+
+    lateinit var textView: TextView
+        private set
+    lateinit var leftButton: Button
+        private set
+    lateinit var rightButton: Button
+        private set
+
+    init {
+        setCanceledOnTouchOutside(false)
+        window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+        requestWindowFeature(Window.FEATURE_NO_TITLE)
+        initView(context, doubleButton)
+    }
+
+    private fun initView(context: Context, doubleButton: Boolean) {
+        val view = LayoutInflater.from(context).inflate(ResUtils.getResId(context, "yyxx_tips_dialog", "layout"), null)
+        setContentView(view)
+
+        val attr = window?.attributes as WindowManager.LayoutParams
+        //设置dialog在布局中的位置
+        attr.gravity = Gravity.CENTER
+
+        textView = view.findViewById(ResUtils.getResId(context, "yyxx_dialog_content", "id"))
+
+        leftButton = view.findViewById(ResUtils.getResId(context, "yyxx_dialog_left", "id"))
+        rightButton = view.findViewById(ResUtils.getResId(context, "yyxx_dialog_right", "id"))
+
+        if (doubleButton) {
+            rightButton.visibility = View.VISIBLE
+        } else {
+            rightButton.visibility = View.GONE
+        }
+    }
+}

library_core/src/main/java/cn/yyxx/columbus/core/utils/EditTextUtils.kt

@@ -0,0 +1,41 @@
+package cn.yyxx.columbus.core.utils
+
+import android.text.TextUtils
+
+/**
+ * @author #Suyghur.
+ * Created on 2021/06/25
+ */
+object EditTextUtils {
+
+    fun filterAccount(input: String): Boolean {
+        if (TextUtils.isEmpty(input)) {
+            return false
+        }
+        if (input.length < 6 || input.length > 18) {
+            return false
+        }
+
+        val regex = "^[0-9A-Za-z]{6,18}\$".toRegex()
+        return regex.matches(input)
+    }
+
+    fun filterPwd(input: String): Boolean {
+        if (TextUtils.isEmpty(input)) {
+            return false
+        }
+        if (input.length < 6 || input.length > 18) {
+            return false
+        }
+
+        val regex = "^[0-9A-Za-z]{6,18}\$".toRegex()
+        return regex.matches(input)
+    }
+
+    fun filterPhone(input: String): Boolean {
+        if (TextUtils.isEmpty(input)) {
+            return false
+        }
+        return true
+    }
+}

library_core/src/main/java/cn/yyxx/columbus/core/utils/MMKVUtils.kt

@@ -18,7 +18,9 @@ class MMKVUtils private constructor() : MMKVHandler {
     var mmkv: MMKV? = null
 
     fun init(context: Context) {
-        MMKV.initialize(context, context.getExternalFilesDir("")!!.absolutePath + File.separator + "/user_info")
+        val dir = context.getExternalFilesDir("")!!.absolutePath + File.separator + "/user_info"
+        MMKV.initialize(context, dir, MMKVLogLevel.LevelInfo)
+        MMKV.registerHandler(this)
         mmkv = MMKV.defaultMMKV()
     }
 
@@ -32,12 +34,12 @@ class MMKVUtils private constructor() : MMKVHandler {
 
 
     override fun wantLogRedirecting(): Boolean {
-        return false
+        return true
     }
 
     override fun mmkvLog(level: MMKVLogLevel?, file: String?, line: Int, function: String?, message: String?) {
         val log = "<${file.toString()}:${line}::${function}>${message}"
-        Logger.i(log)
+        Logger.d(log)
     }
 
     companion object {

library_core/src/main/java/cn/yyxx/columbus/core/utils/SessionUtils.kt

@@ -137,7 +137,7 @@ class SessionUtils private constructor() {
             jsonArray.put(item.toJSONObject())
         }
 
-        val filePath = FileUtils.getUserInfoFilePath(context)
+//        val filePath = FileUtils.getUserInfoFilePath(context)
 
         try {
             jsonObject.put("info", jsonArray)
@@ -146,7 +146,13 @@ class SessionUtils private constructor() {
         }
 
         Logger.d("写入用户信息:$jsonObject")
-        FileUtils.writeFile(jsonObject.toString(), filePath)
+        val keyName = when (Host.IP_MODEL) {
+            HostModelUtils.ENV_ONLINE -> "online"
+            HostModelUtils.ENV_TEST -> "test"
+            else -> "online"
+        }
+        MMKVUtils.getInstance().mmkv?.encode(keyName, jsonObject.toString())
+//        FileUtils.writeFile(jsonObject.toString(), filePath)
     }
 
     private fun toList(json: String): MutableList<Session> {

library_core/src/main/res/drawable/yyxx_btn_gray_bg.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="8dp" />
+    <solid android:color="@color/yyxx_color_gray_30" />
+</shape>

library_core/src/main/res/layout/yyxx_tips_dialog.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="350dp"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="10dp"
+    android:layout_marginRight="10dp"
+    android:background="@drawable/yyxx_login_panel_bg"
+    android:gravity="center">
+
+    <TextView
+        android:id="@+id/yyxx_dialog_content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="40dp"
+        android:layout_marginBottom="20dp"
+        android:gravity="center_horizontal"
+        android:textColor="@color/yyxx_color_gray"
+        android:textSize="18sp"
+        app:layout_constraintBottom_toTopOf="@id/yyxx_dialog_btn_group"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/yyxx_dialog_btn_group"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginBottom="20dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/yyxx_dialog_content">
+
+        <Button
+            android:id="@+id/yyxx_dialog_left"
+            android:layout_width="120dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginEnd="10dp"
+            android:layout_marginRight="10dp"
+            android:background="@drawable/yyxx_btn_gray_bg"
+            android:textAllCaps="false"
+            android:textColor="@color/yyxx_color_gray"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/yyxx_dialog_right"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <Button
+            android:id="@+id/yyxx_dialog_right"
+            android:layout_width="120dp"
+            android:layout_height="40dp"
+            android:layout_marginStart="10dp"
+            android:layout_marginLeft="10dp"
+            android:layout_marginEnd="20dp"
+            android:layout_marginRight="20dp"
+            android:background="@drawable/yyxx_btn_green_blue_bg"
+            android:gravity="center"
+            android:textAllCaps="false"
+            android:textColor="@color/yyxx_color_white"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/yyxx_dialog_left"
+            app:layout_constraintTop_toTopOf="parent" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

library_core/src/main/res/values/yyxx_strings.xml

@@ -24,6 +24,10 @@
     <string name="yyxx_tv_agreement">我已閲讀並同意《會員條款及管理規章》</string>
     <string name="yyxx_tv_agreement_title">會員條款及管理規章</string>
     <string name="yyxx_tv_forget_pwd_title">忘記密碼</string>
+    <string name="yyxx_tv_exit_content">您確認立即退出遊戲嗎？</string>
+    <string name="yyxx_tv_exit_left">下次再見</string>
+    <string name="yyxx_tv_exit_right">再玩一下</string>
+
 
     <string name="yyxx_title_forget">忘記密碼</string>
     <string name="yyxx_title_agreement">會員條款及管理規章</string>
@@ -37,4 +41,9 @@
     <string name="yyxx_hint_forget_account">請輸入您的帳號</string>
     <string name="yyxx_hint_forget_phone">請輸入您的手機門號</string>
 
+    <string name="yyxx_tips_account_format_error">您輸入的帳號格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_pwd_format_error">您輸入的帳號格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_phone_format_error">您輸入的帳號格式有誤，請重新輸入</string>
+    <string name="yyxx_tips_area_code_format_error">您選擇的有誤，請重新選擇</string>
+
 </resources>