v1.0.0开发：v1.0.0版本预发布

channel_registry/channel_huawei2/build.gradle

@@ -53,7 +53,7 @@ dependencies {
     api "com.huawei.agconnect:agconnect-auth-facebook:1.6.4.300"
     api "com.huawei.agconnect:agconnect-auth-google:1.6.4.300"
     api 'com.huawei.hms:hwid:6.4.0.300'
-    api 'com.facebook.android:facebook-login:13.0.0'
+    api 'com.facebook.android:facebook-login:13.1.0'
     api 'com.google.android.gms:play-services-auth:20.1.0'
 }
 

channel_registry/channel_huawei2/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-channel-lib-huawei'
-    PUBLISH_VERSION = '1.0.0-rc4'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()

channel_registry/channel_oppo/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-channel-lib-oppo'
-    PUBLISH_VERSION = '1.0.0-rc4'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()
@@ -88,7 +88,6 @@ publishing {
             // This is an arbitrary name, you may also use "mavencentral" or
             // any other name that's descriptive for you
             name = "mavencentral"
-
             def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
             def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
             // You only need this if you want to publish snapshots, otherwise just set the URL

demo/build.gradle

@@ -21,9 +21,6 @@ android {
         resConfigs 'zh-rCN', 'zh-rHK', 'zh-rTW'
     }
 
-    buildFeatures {
-        buildConfig false
-    }
     signingConfigs {
         config {
             keyAlias keystoreProperties['keyAlias']
@@ -70,15 +67,25 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation 'androidx.appcompat:appcompat:1.4.1'
 
-//    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-comm:1.0.0-rc6'
-//    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-impl:1.0.0-rc4'
-//    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-core:1.0.0-rc5'
-//    implementation 'io.github.yyxxgame.sdk:eyuancomm-lang-vn:1.0.0-rc4'
+//    implementation "androidx.core:core-ktx:1.7.0"
+//    implementation 'com.android.installreferrer:installreferrer:2.2'
+//    // 日志采集框架
+//    implementation 'io.github.suyghur.dolin:zap:1.0.0'
+//    //mmkv
+//    implementation 'com.tencent:mmkv-static:1.2.10'
+//
+//    implementation 'com.adjust.sdk:adjust-android:4.28.2'
 
+//    implementation files('libs/library_comm-release.aar')
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-comm:1.0.0-rc8'
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-impl:1.0.0-rc8'
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-sdk-ktx-core:1.0.0-rc8'
+    implementation 'io.github.yyxxgame.sdk:eyuancomm-lang-vn:1.0.0-rc8'
 
-    implementation project(':library_comm')
-    implementation project(':library_impl')
 
-    implementation project(':module_eyuan:library_eyuan')
-    implementation project(':module_eyuan:library_vn_language')
+//    implementation project(':library_comm')
+//    implementation project(':library_impl')
+//
+//    implementation project(':module_eyuan:library_eyuan')
+//    implementation project(':module_eyuan:library_vn_language')
 }

demo/src/main/assets/agconnect-services.json

@@ -0,0 +1,75 @@
+{
+	"agcgw":{
+		"backurl":"connect-dra.hispace.hicloud.com",
+		"url":"connect-dra.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-dra.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-dra.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.ru",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"client":{
+		"cp_id":"2640852000031689367",
+		"product_id":"99536292102122334",
+		"client_id":"857263694499824576",
+		"client_secret":"444D0009F640BCCBA6C35B8B9CDCFBF111F4362FF30976D1F1A617B277583090",
+		"project_id":"99536292102122334",
+		"app_id":"105840995",
+		"api_key":"DAEDAHW+7S8A2cpM7dYK1vXa1jPpAIS/raxZqBUOMGxBsPeqUcbbLM7/6Xnm5jO6+qrU+N6ABg0duPtxsDPTZravbFS9E81g18ArBw==",
+		"package_name":"com.xgyy.Thettk.huawei"
+	},
+	"oauth_client":{
+		"client_id":"105840995",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"105840995",
+		"package_name":"com.xgyy.Thettk.huawei"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"search":{
+			"url":"https://search-dra.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url":"https://ops-dra.agcstorage.link",
+			"default_storage":""
+		},
+		"ml":{
+			"mlservice_url":"ml-api-dra.ai.dbankcloud.com,ml-api-dra.ai.dbankcloud.cn"
+		}
+	},
+	"region":"SG",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.xgyy.Thettk.huawei",
+			"client":{
+				"app_id":"105840995"
+			},
+			"app_info":{
+				"package_name":"com.xgyy.Thettk.huawei",
+				"app_id":"105840995"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"105840995"
+			}
+		}
+	]
+}

demo/src/main/assets/yyxx_game/yyxx_comm.properties

@@ -6,7 +6,7 @@ YYXX_CHANNEL_ID=4
 # Adjust配置
 YYXX_ADJUST_TRACE=true
 YYXX_ADJUST_APP_ID=ymyq28xetdkw
-YYXX_ADJUST_CHANNEL_TOKEN=6snwjqf
+#YYXX_ADJUST_CHANNEL_TOKEN=6snwjqf
 # Facebook Analytics配置
 YYXX_FACEBOOK_TRACE=false
 # Firebase Analytics配置

demo/src/main/kotlin/com/eyuancomm/demo/DemoActivity.kt

@@ -231,10 +231,13 @@ class DemoActivity : Activity(), View.OnClickListener {
         gameChargeInfo.amount = 100
         //商品ID，计费点
         gameChargeInfo.productId = "p.1yuan"
+//        gameChargeInfo.productId = "vn.tscq.22000vnd"
         //商品名称
         gameChargeInfo.productName = "60元寶"
+//        gameChargeInfo.productName = "80NB"
         //商品描述
         gameChargeInfo.productDesc = "60元寶"
+//        gameChargeInfo.productDesc = "80NB"
         gameChargeInfo.cpPayTime = System.currentTimeMillis() / 1000
         gameChargeInfo.cpPaySign = "test123"
         return gameChargeInfo

library_comm/proguard-rules.pro

@@ -153,6 +153,8 @@
 -keep class cn.yyxx.eyuancomm.comm.entity.SdkLoginInfo$Companion{public <fields>; public <methods>;}
 -keep class cn.yyxx.eyuancomm.comm.entity.SdkRoleInfo{public <fields>; public <methods>;}
 -keep class cn.yyxx.eyuancomm.comm.network.Host{public <fields>; public<methods>;}
+-keep class cn.yyxx.eyuancomm.comm.network.SdkRequest$Companion{public <fields>; public<methods>;}
+-keep class cn.yyxx.eyuancomm.comm.network.SdkRequest{public <fields>; public<methods>;}
 -keep class cn.yyxx.eyuancomm.comm.network.VolleyRequest{public <fields>; public<methods>;}
 -keep class cn.yyxx.eyuancomm.comm.internal.**{public <fields>; public <methods>;}
 -keep class cn.yyxx.eyuancomm.comm.impl.CommSdkDrive{public <fields>; public <methods>;}

library_comm/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-sdk-ktx-comm'
-    PUBLISH_VERSION = '1.0.0-rc6'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/Version.kt

@@ -5,7 +5,7 @@ package cn.yyxx.eyuancomm
  * Created on 2021/06/09
  */
 object Version {
-    const val VERSION_NAME = "1.0.0-rc6"
+    const val VERSION_NAME = "1.0.0-rc8"
     const val VERSION_CODE = 100
     const val SERVER_VERSION = "1.0.0"
 }

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/comm/entity/Function.kt

@@ -12,6 +12,7 @@ object Function {
     const val LOGIN = "login"
     const val LOGOUT = "logout"
     const val CHARGE = "charge"
+    const val NOTIFY_ORDER = "notifyOrder"
     const val HAS_EXIT_VIEW = "hasExitView"
     const val OPEN_EXIT_VIEW = "openExitView"
     const val ROLE_CREATE = "roleCreate"

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/comm/impl/CommSdkImpl.kt

@@ -350,6 +350,12 @@ internal class CommSdkImpl(context: Context) {
             return
         }
 
+        SdkLoginInfo.instance.currentRoleId = roleInfo.roleId
+        SdkLoginInfo.instance.currentRoleName = roleInfo.roleName
+        SdkLoginInfo.instance.currentRoleLevel = roleInfo.roleLevel
+        SdkLoginInfo.instance.currentServerId = roleInfo.serverId
+        SdkLoginInfo.instance.currentServerName = roleInfo.serverName
+
         SdkRequest.instance.submitRoleData(activity, roleInfo, "createRole") { resultInfo ->
             Logger.d(resultInfo.toString())
         }
@@ -371,6 +377,12 @@ internal class CommSdkImpl(context: Context) {
             return
         }
 
+        SdkLoginInfo.instance.currentRoleId = roleInfo.roleId
+        SdkLoginInfo.instance.currentRoleName = roleInfo.roleName
+        SdkLoginInfo.instance.currentRoleLevel = roleInfo.roleLevel
+        SdkLoginInfo.instance.currentServerId = roleInfo.serverId
+        SdkLoginInfo.instance.currentServerName = roleInfo.serverName
+
         SdkRequest.instance.submitRoleData(activity, roleInfo, "enterGame") { resultInfo ->
             Logger.d(resultInfo.toString())
         }
@@ -392,6 +404,12 @@ internal class CommSdkImpl(context: Context) {
             return
         }
 
+        SdkLoginInfo.instance.currentRoleId = roleInfo.roleId
+        SdkLoginInfo.instance.currentRoleName = roleInfo.roleName
+        SdkLoginInfo.instance.currentRoleLevel = roleInfo.roleLevel
+        SdkLoginInfo.instance.currentServerId = roleInfo.serverId
+        SdkLoginInfo.instance.currentServerName = roleInfo.serverName
+
         SdkProxyManager.call(Function.ROLE_LEVEL_UP, arrayOf(Activity::class.java, SdkRoleInfo::class.java), arrayOf(activity, roleInfo))
     }
 

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/comm/internal/feature/IOrder.kt

@@ -1,17 +0,0 @@
-package cn.yyxx.eyuancomm.comm.internal.feature
-
-import android.app.Activity
-import cn.yyxx.eyuancomm.comm.entity.SdkChargeInfo
-
-/**
- * @author #Suyghur.
- * Created on 2022/01/17
- */
-interface IOrder {
-
-    /**
-     * 获取订单号
-     * 不是所有渠道都需要自定义获取订单号
-     */
-    fun notifyOrder(activity: Activity, chargeInfo: SdkChargeInfo, callback: (Int, String) -> Unit)
-}

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/comm/network/SdkRequest.kt

@@ -2,9 +2,11 @@ package cn.yyxx.eyuancomm.comm.network
 
 import android.content.Context
 import android.text.TextUtils
+import cn.yyxx.eyuancomm.comm.EYuanCommSdk
 import cn.yyxx.eyuancomm.comm.entity.ResultInfo
 import cn.yyxx.eyuancomm.comm.entity.SdkChargeInfo
 import cn.yyxx.eyuancomm.comm.entity.SdkRoleInfo
+import cn.yyxx.eyuancomm.comm.impl.CommSdkDrive
 import cn.yyxx.eyuancomm.comm.utils.Logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
@@ -17,7 +19,7 @@ import org.json.JSONObject
  * @author #Suyghur.
  * Created on 2022/01/25
  */
-class SdkRequest {
+class SdkRequest private constructor() {
 
     companion object {
         val instance: SdkRequest by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/comm/network/VolleyRequest.kt

@@ -39,6 +39,10 @@ object VolleyRequest {
 
     @Throws
     fun post(context: Context, jsonObject: JSONObject, callback: (ResultInfo) -> Unit) {
+        doPost(context, jsonObject, callback)
+    }
+
+    private fun doPost(context: Context, jsonObject: JSONObject, callback: (ResultInfo) -> Unit) {
         val time = System.currentTimeMillis().toString()
         val randomKey = time + StrUtils.getRandomString(16)
         val rawKey = Md5Utils.encodeByMD5(randomKey)
@@ -182,11 +186,13 @@ object VolleyRequest {
                     resultInfo.code = getInt("code")
                     resultInfo.msg = getString("msg")
                 }
+                Logger.d(resultInfo.toString())
                 callback(resultInfo)
             }) {
                 if (TextUtils.isEmpty(it.localizedMessage)) {
                     resultInfo.msg = it.localizedMessage!!
                 }
+                Logger.d(resultInfo.toString())
                 callback(resultInfo)
             }
             VolleySingleton.getInstance(context.applicationContext).addToRequestQueue(context.applicationContext, request)
@@ -216,7 +222,6 @@ object VolleyRequest {
         return if (!TextUtils.isEmpty(message)) {
             message!!
         } else {
-//            ResUtils.getResString(context, "yyxx_network_tv_error")
             "There was an error in the network connection, please try again later"
         }
     }
@@ -230,7 +235,6 @@ object VolleyRequest {
             if (!TextUtils.isEmpty(message)) {
                 resultInfo.msg = message!!
             } else {
-//                resultInfo.msg = ResUtils.getResString(context, "yyxx_network_tv_error")
                 resultInfo.msg = "There was an error in the network connection, please try again later"
             }
         }

library_comm/src/main/kotlin/cn/yyxx/eyuancomm/comm/trace/channel/AdjustEventImpl.kt

@@ -66,6 +66,11 @@ class AdjustEventImpl(private val onIdRead: (String) -> Unit) : ITrace {
         }
 
         Adjust.onCreate(config)
+
+        // add session callback params
+        Adjust.addSessionCallbackParameter("game_code", ParamsUtils.getGameCode(application))
+        Adjust.addSessionCallbackParameter("gcp_code", ParamsUtils.getGcpCode(application))
+
         if (MMKVManager.instance.eventKV.decodeBool("adjust_activities")) {
             isInitSuccess = true
             return

library_impl/build.gradle

@@ -43,6 +43,7 @@ android {
 
 dependencies {
     compileOnly project(':library_comm')
+//    compileOnly files('libs/library_comm-release.aar')
     compileOnly project(':module_eyuan:library_eyuan')
     compileOnly project(':channel_registry:channel_oppo')
     compileOnly project(':channel_registry:channel_vivo')

library_impl/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-sdk-ktx-impl'
-    PUBLISH_VERSION = '1.0.0-rc4'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()

library_impl/src/main/java/cn/yyxx/eyuancomm/impl/ImplSdkProxy.kt

@@ -53,16 +53,6 @@ class ImplSdkProxy(channelId: String) {
         mImpl?.charge(activity, chargeInfo, callback)
     }
 
-//    fun notifyOrder(activity: Activity, chargeInfo: SdkChargeInfo, callback: ICallback) {
-//        if (mImpl is IOrder) {
-//            (mImpl as IOrder).notifyOrder(activity, chargeInfo) { code, result ->
-//                callback.onResult(code, result)
-//            }
-//        } else {
-//            callback.onResult(-1, "获取订单扩展参数异常")
-//        }
-//    }
-
     fun roleCreate(activity: Activity, roleInfo: SdkRoleInfo) {
         if (mImpl is IRoleData) {
             (mImpl as IRoleData).roleCreate(activity, roleInfo)

library_impl/src/main/java/cn/yyxx/eyuancomm/impl/channel/eyuangame/ChannelSdkEYuanGame.kt

@@ -62,7 +62,6 @@ internal class ChannelSdkEYuanGame : IFeature, ILifeCycle, IConfig, IRoleData, I
         })
     }
 
-
     override fun hasExitView(activity: Activity): Boolean = true
 
     override fun openExitView(activity: Activity, callback: ICallback) {

module_eyuan/library_eyuan/build.gradle

@@ -11,13 +11,6 @@ android {
     defaultConfig {
         minSdk rootProject.ext.android.minSdk
         targetSdk rootProject.ext.android.targetSdk
-
-//        externalNativeBuild {
-//            cmake {
-//                cppFlags '-std=c++11 -frtti -fexceptions -lz'
-//                abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-//            }
-//        }
     }
 
 
@@ -48,13 +41,6 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
-
-//    externalNativeBuild {
-//        cmake {
-//            path "CMakeLists.txt"
-//        }
-//    }
-
 }
 
 dependencies {
@@ -76,8 +62,8 @@ dependencies {
 
     //facebook
     implementation 'com.facebook.android:facebook-core:13.1.0'
-    implementation 'com.facebook.android:facebook-login:13.0.0'
-    implementation 'com.facebook.android:facebook-share:13.0.0'
+    implementation 'com.facebook.android:facebook-login:13.1.0'
+    implementation 'com.facebook.android:facebook-share:13.1.0'
 
     compileOnly project(':module_eyuan:library_hk_language')
     compileOnly project(':library_comm')

module_eyuan/library_eyuan/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-sdk-ktx-core'
-    PUBLISH_VERSION = '1.0.0-rc5'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()

module_eyuan/library_eyuan/src/main/kotlin/cn/yyxx/eyuancomm/core/impl/InAppBilling.kt

@@ -15,26 +15,12 @@ import org.json.JSONObject
  * @author #Suyghur.
  * Created on 2021/06/17
  */
-internal class InAppBilling : PurchasesUpdatedListener {
+internal class InAppBilling private constructor(): PurchasesUpdatedListener {
 
     private var billingClient: BillingClient? = null
 
     private var callback: ICallback? = null
 
-//    private val consumeHandler = object : IOrder {
-//        override fun onConsume(activity: Activity, chargeInfo: SdkChargeInfo, token: String, cache: Boolean) {
-//            if (cache) {
-//                consumeCacheOrder(activity, chargeInfo, token)
-//            } else {
-//                consumeOrder(activity, chargeInfo, token)
-//            }
-//        }
-//
-//        override fun onFinish() {
-//            disConnection()
-//        }
-//    }
-
     companion object {
         val instance: InAppBilling by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
             InAppBilling()

module_eyuan/library_hk_language/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-lang-hk'
-    PUBLISH_VERSION = '1.0.0-rc4'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()

module_eyuan/library_vn_language/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 ext {
     PUBLISH_GROUP_ID = 'io.github.yyxxgame.sdk'
     PUBLISH_ARTIFACT_ID = 'eyuancomm-lang-vn'
-    PUBLISH_VERSION = '1.0.0-rc4'
+    PUBLISH_VERSION = '1.0.0-rc8'
 }
 
 Properties properties = new Properties()