Browse Source

v1.0.0-alpha2开发:
1)修复初始化获取gaid时,loading无法关闭
2)Adjust的debug日志跟随sdk的own_debug开关

#Suyghur 3 years ago
parent
commit
83a9a83a40

+ 1 - 1
build.gradle

@@ -2,7 +2,7 @@
 buildscript {
 
     // demo远程依赖
-    ext.REMOTE_LIBRARY = true
+    ext.REMOTE_LIBRARY = false
     // 发布开关
     ext.PUBLISH_ENABLE = true
     // 混淆开关

BIN
demo/libs/library_core-release.aar


+ 0 - 1
demo/src/main/res/values/strings.xml

@@ -18,5 +18,4 @@
     <string name="default_web_client_id" translatable="false">70429070957-7clr9u565jrjgbgg474ksg8q2esq2okj.apps.googleusercontent.com</string>
     <string name="com.crashlytics.RequireBuildId" translatable="false">true</string>
     <string name="com.google.firebase.crashlytics.mapping_file_id" translatable="false">00000000000000000000000000000000</string>
-
 </resources>

+ 1 - 1
library_base/src/main/java/cn/yyxx/eyuangame/Version.kt

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

+ 1 - 1
library_core/publish.gradle

@@ -3,7 +3,7 @@ apply plugin: 'signing'
 
 def PUBLISH_GROUP_ID = "io.github.yyxxgame.sdk"
 def PUBLISH_ARTIFACT_ID = "eyuangame-sdk-ktx"
-def PUBLISH_VERSION = "0.0.1"
+def PUBLISH_VERSION = "1.0.0-alpha2"
 
 Properties properties = new Properties()
 properties.load(project.rootProject.file('local.properties').newDataInputStream())

+ 3 - 3
library_core/src/main/java/cn/yyxx/eyuangame/core/impl/SdkBridgeImpl.kt

@@ -80,11 +80,11 @@ class SdkBridgeImpl(context: Context) {
             if (code == 0) {
                 Logger.i("谷歌框架可以访问,请求gaid")
                 SdkDrive.instance.setParam("device_id", GAIDUtils.getGoogleAdid())
-                FirebaseCrashlytics.getInstance().setCustomKey("device_id", GAIDUtils.getGoogleAdid())
+//                FirebaseCrashlytics.getInstance().setCustomKey("device_id", GAIDUtils.getGoogleAdid())
             } else {
                 Logger.e("谷歌框架不可访问,使用android id替代")
                 SdkDrive.instance.setParam("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
-                FirebaseCrashlytics.getInstance().setCustomKey("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
+//                FirebaseCrashlytics.getInstance().setCustomKey("device_id", DeviceInfoUtils.getAndroidDeviceId(application))
             }
             hasReadGaid = true
         }
@@ -146,7 +146,7 @@ class SdkBridgeImpl(context: Context) {
                     hideInitLoadingDialog()
                     startSdkInit(activity, callback, initCallback)
                 }
-            }
+            }.start()
         } else {
             Logger.i("加载gaid成功,开始初始化...")
             startSdkInit(activity, callback, initCallback)

+ 8 - 1
library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingAdjustImpl.kt

@@ -12,6 +12,7 @@ import cn.yyxx.eyuangame.core.entity.SdkBackLoginInfo
 import cn.yyxx.eyuangame.core.internal.IEventObserver
 import cn.yyxx.eyuangame.core.utils.MMKVUtils
 import cn.yyxx.support.JsonUtils
+import cn.yyxx.support.hawkeye.LogUtils
 import com.adjust.sdk.Adjust
 import com.adjust.sdk.AdjustConfig
 import com.adjust.sdk.AdjustEvent
@@ -48,7 +49,13 @@ class LinkingAdjustImpl : IEventObserver {
             return
         }
 
-        val config = AdjustConfig(application, appId, AdjustConfig.ENVIRONMENT_PRODUCTION, true)
+        val environment = if (LogUtils.DEBUG) {
+            AdjustConfig.ENVIRONMENT_SANDBOX
+        } else {
+            AdjustConfig.ENVIRONMENT_PRODUCTION
+        }
+
+        val config = AdjustConfig(application, appId, environment, true)
         config.setLogLevel(LogLevel.VERBOSE)
         Adjust.onCreate(config)
         if (MMKVUtils.instance.eventKV.decodeBool("adjust_activities")) {

+ 1 - 2
library_core/src/main/java/cn/yyxx/eyuangame/core/network/Host.kt

@@ -9,7 +9,7 @@ import cn.yyxx.support.HostModelUtils
  */
 object Host {
 
-    private const val DEFAULT_ONLINE_HOST = ""
+    private const val DEFAULT_ONLINE_HOST = "http://testsdkapi.eyuangame.com"
     private const val DEFAULT_TEST_HOST = "http://testsdkapi.eyuangame.com"
 
     var HOST = ""
@@ -44,6 +44,5 @@ object Host {
             HostModelUtils.ENV_TEST -> HOST = DEFAULT_TEST_HOST
             HostModelUtils.ENV_ONLINE -> HOST = DEFAULT_ONLINE_HOST
         }
-        //初始化接口路由
     }
 }

BIN
libs/eyuangamesdk_base_1.0.0.jar