Merge branch 'feature/v1.0.3' into feature/v1.1.0

* feature/v1.0.3:
  v1.0.3开发：1.0.3版本发布
  v1.0.3开发：调整账号规则的正则

# Conflicts:
#	config.gradle
#	core/library_core/src/main/java/cn/yyxx/eyuangame/core/impl/iab/ChargeImpl.kt
#	core/library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/UserSignInImpl.kt
#	demo/build.gradle
#	demo/src/main/java/com/eyuangame/demo/DemoActivity.kt

core/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()

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

@@ -247,21 +247,28 @@ class ChargeImpl : InAppBilling() {
      */
     private fun notifyOrder2Backend(activity: Activity, orderId: String, purchase: Purchase, isCache: Boolean = false) {
         SdkRequest.instance.notifyOrder(activity, orderId, purchase.originalJson) { 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)
+                    callback(-1, "发货失败")
                 }
-                ToastUtils.toastInfo(activity, msg)
-                callback(-1, "发货失败")
             }
         }
     }

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

@@ -172,10 +172,6 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val onSucc
                         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
@@ -203,7 +199,7 @@ class UserSignInImpl constructor(val activity: LoginActivity, private val onSucc
                     }
                     onFailed(msg)
                 }
-            }
+                }
         } catch (e: Exception) {
             e.printStackTrace()
             hideLoadingDialog()

core/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

core/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)
     }
 

demo/build.gradle

@@ -68,7 +68,7 @@ android {
 
 dependencies {
 //    if (rootProject.ext.module.publish) {
-//        implementation 'io.github.yyxxgame.sdk:eyuangame-sdk-ktx:1.0.2-fix1'
+//        implementation 'io.github.yyxxgame.sdk:eyuangame-sdk-ktx:1.0.3'
 //        implementation 'io.github.yyxxgame.sdk:eyuangame-component-lang-vn:1.0.2'
 //    } else {
 //        api project(':core:library_core')

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

@@ -38,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
@@ -171,6 +170,7 @@ class DemoActivity : AppCompatActivity(), View.OnClickListener {
                     }
 
                 })
+<<<<<<< HEAD
                 12 -> {
 //                    SdkRequest.instance.uploadLogFile(this@DemoActivity, true) { resultInfo ->
 //                        ToastUtils.toastInfo(
@@ -179,6 +179,8 @@ class DemoActivity : AppCompatActivity(), View.OnClickListener {
 //                        )
 //                    }
                 }
+=======
+>>>>>>> feature/v1.0.3
             }
         }
     }