v1.0.3开发：调整账号规则的正则

config.gradle

@@ -4,7 +4,7 @@ ext {
             remoteLib    : false,
             minifyEnabled: true,
             publish      : false,
-            language     : 1
+            language     : 2
     ]
 
     android = [

demo/build.gradle

@@ -82,5 +82,7 @@ dependencies {
     // ui
     api rootProject.ext.uiLibs
 
+    implementation files('libs/hms-base.jar')
+
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
 }

demo/src/main/java/com/eyuangame/demo/DemoActivity.kt

@@ -14,9 +14,6 @@ import cn.yyxx.eyuangame.base.entity.SdkChargeInfo
 import cn.yyxx.eyuangame.base.entity.SdkEvent
 import cn.yyxx.eyuangame.base.entity.SdkRoleInfo
 import cn.yyxx.eyuangame.base.internal.ICallback
-import cn.yyxx.eyuangame.core.entity.ResultInfo
-import cn.yyxx.eyuangame.core.internal.IRequestCallback
-import cn.yyxx.eyuangame.core.network.SdkRequest
 import cn.yyxx.support.hawkeye.LogUtils
 import cn.yyxx.support.hawkeye.ToastUtils
 import kotlin.system.exitProcess
@@ -41,7 +38,6 @@ class DemoActivity : AppCompatActivity(), View.OnClickListener {
         Item(0, "09 模拟CP打点（玩家首次完成结缘）"),
         Item(10, "10 crashlytics崩溃测试"),
         Item(11, "11 Facebook分享测试"),
-        Item(12, "12 sdk日志上报测试")
     )
 
     private lateinit var layout: LinearLayout
@@ -174,16 +170,6 @@ class DemoActivity : AppCompatActivity(), View.OnClickListener {
                     }
 
                 })
-                12 -> {
-                    SdkRequest.instance.uploadLogFile(this@DemoActivity, true, object : IRequestCallback {
-                        override fun onResponse(resultInfo: ResultInfo) {
-                            ToastUtils.toastInfo(
-                                this@DemoActivity,
-                                "---- demo提示不做翻译 ----\ncode : ${resultInfo.code}\n msg : ${resultInfo.msg}\n ---- demo提示不做翻译 ----"
-                            )
-                        }
-                    })
-                }
             }
         }
     }

library_core/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuangame-sdk-ktx'
-    PUBLISH_VERSION = '1.0.2-fix1'
+    PUBLISH_VERSION = '1.0.3'
 }
 
 Properties properties = new Properties()

library_core/src/main/java/cn/yyxx/eyuangame/core/impl/iab/ChargeImpl.kt

@@ -257,21 +257,28 @@ class ChargeImpl : InAppBilling() {
     private fun notifyOrder2Backend(activity: Activity, orderId: String, purchase: Purchase, isCache: Boolean = false) {
         SdkRequest.instance.notifyOrder(activity, orderId, purchase.originalJson, object : IRequestCallback {
             override fun onResponse(resultInfo: ResultInfo) {
-                if (resultInfo.code == 1) {
-                    //消耗订单
-                    consumeAsync(activity, purchase, isCache)
-                } else {
-                    //失败则缓存订单
-                    saveOrderInfo(purchase.orderId, orderId)
-                    dismissDialog()
-                    disConnection()
-                    val msg = if (TextUtils.isEmpty(resultInfo.msg)) {
-                        ResUtils.getResString(activity, "yyxx_charge_tv_error")
-                    } else {
-                        resultInfo.msg
+                when (resultInfo.code) {
+                    1 -> {
+                        //消耗订单
+                        consumeAsync(activity, purchase, isCache)
+                    }
+                    2 -> {
+                        Logger.d(resultInfo.msg)
+                        consumeAsync(activity, purchase, isCache)
+                    }
+                    else -> {
+                        //失败则缓存订单
+                        saveOrderInfo(purchase.orderId, orderId)
+                        dismissDialog()
+                        disConnection()
+                        val msg = if (TextUtils.isEmpty(resultInfo.msg)) {
+                            ResUtils.getResString(activity, "yyxx_charge_tv_error")
+                        } else {
+                            resultInfo.msg
+                        }
+                        ToastUtils.toastInfo(activity, msg)
+                        implCallback.onResult(-1, "发货失败")
                     }
-                    ToastUtils.toastInfo(activity, msg)
-                    implCallback.onResult(-1, "发货失败")
                 }
             }
         })

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

@@ -175,10 +175,6 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val callba
                             SdkBackLoginInfo.instance.phoneNum = jsonObject.getString("phone_num")
                             SdkBackLoginInfo.instance.loginType = LoginType.TYPE_ACCOUNT_LOGIN
 
-                            if (jsonObject.getInt("upload_log_auto") == 1) {
-                                uploadLogFile(context)
-                            }
-
                             with(Session()) {
                                 userId = SdkBackLoginInfo.instance.userId
                                 loginType = SdkBackLoginInfo.instance.loginType

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

@@ -49,7 +49,6 @@ class RegisterFragment : Fragment(), View.OnClickListener {
 
     private var agreementDialog: AgreementDialog? = null
 
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         super.onCreateView(inflater, container, savedInstanceState)
         loginImpl = requireActivity() as LoginActivity

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

@@ -16,7 +16,7 @@ object EditTextUtils {
             return false
         }
 
-        val regex = "^[0-9A-Za-z]{6,18}\$".toRegex()
+        val regex = "^[0-9A-Za-z\\s]{6,18}\$".toRegex()
         return regex.matches(input)
     }