v1.0.0开发：

1）修改选择登陆方式展示逻辑
2）公共参数增加aid字段

demo/build.gradle

@@ -111,5 +111,4 @@ dependencies {
         api project(':library_core')
     }
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
-
 }

keystore.properties

@@ -1,14 +1,3 @@
-#demo
-#storePassword=demo6ztv_yyxx2021
-#keyPassword=demo6ztv_yyxx2021
-#keyAlias=alias.demo_yyxx2021
-#storeFile=../zkeystore/demo_yyxx.keystore
-
-#storePassword=demo53ux_yyxx2021
-#keyPassword=demo53ux_yyxx2021
-#keyAlias=alias.demo_yyxx2021
-#storeFile=../zkeystore/demo_yyxx_backup.keystore
-
 storePassword=shzd1y28_yyxx2021
 keyPassword=shzd1y28_yyxx2021
 keyAlias=alias.shzd_yyxx2021

library_core/src/main/cpp/comm_map.cpp

@@ -32,7 +32,7 @@ void CommMap::Init(JNIEnv *env, jobject context) {
     } else {
         comm_params["simulator"] = 0;
     }
-
+    comm_params["aid"] = "";
     comm_params["android_id"] = ToolKit::GetAndroidDeviceId(env, context);
     comm_params["network"] = ToolKit::GetNetworkType(env, context);
     comm_params["os"] = 1;

library_core/src/main/cpp/sdk_drive.cpp

@@ -16,7 +16,6 @@
 static void InitSdkDrive(JNIEnv *env, jobject thiz, jobject context) {
     CommMap::GetInstance()->Init(env, context);
     Logger::is_debug = ParamsKit::GetDebugModel(env, context);
-    Logger::D(env, ToolKit::ToJsonString(CommMap::GetInstance()->comm_params));
 }
 
 static void SetParam(JNIEnv *env, jobject thiz, jstring key, jstring value) {
@@ -45,6 +44,8 @@ static jstring InvokeJob(JNIEnv *env, jobject thiz, jobject context, jstring key
     Json::Value root = ToolKit::ToJsonObject(data_);
     root["common"] = CommMap::GetInstance()->comm_params;
 
+    Logger::D(env, "请求参数 : " + ToolKit::ToJsonString(root));
+
     char *p = AesUtils::Encrypt(ToolKit::ToJsonString(root).c_str(), reinterpret_cast<const uint8_t *>(key_));
     jstring result = ToolKit::GetJString(env, p);
     env->ReleaseStringUTFChars(key, key_);

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

@@ -93,7 +93,14 @@ class SdkBridgeImpl(context: Context) {
     fun initApplication(application: Application) {
         Logger.i("EYuanGameSdk initApplication ...")
         MMKVUtils.instance.init(application)
-        Linking.instance.initialize(application)
+        Linking.instance.initialize(application, object : Linking.OnTraceIdRead {
+            override fun onAdjustIdRead(id: String) {
+                Logger.d("onAdjustIdRead : $id")
+                SdkDrive.instance.setParam("aid", id)
+                MMKVUtils.instance.eventKV.encode("adjust_id", id)
+            }
+
+        })
     }
 
     fun initialize(activity: Activity, isLandscape: Boolean, callback: ICallback, initCallback: IInitialize) {
@@ -124,6 +131,13 @@ class SdkBridgeImpl(context: Context) {
         //获取当前屏幕尺寸
         SdkDrive.instance.setParam("screen", DensityUtils.getResolutionByFullScreen(activity))
 
+        val adjustId = MMKVUtils.instance.eventKV.decodeString("adjust_id")
+        if (TextUtils.isEmpty(adjustId)) {
+            SdkDrive.instance.setParam("aid", "")
+        } else {
+            SdkDrive.instance.setParam("aid", adjustId!!)
+        }
+
         if (!hasReadGaid) {
             Logger.e("还未完成gaid加载，将延迟初始化")
             showInitLoadingDialog(activity)

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

@@ -106,9 +106,8 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
             }
 
         })
-        showAutoLoginDialog()
-        showChooseDialog()
         initView()
+        showAutoLoginDialog()
     }
 
 
@@ -120,9 +119,17 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
 
         session = SessionUtils.instance.getLocalLastSession(this)
 
-        if (session == null || !isAutoLogin) {
+        if (session == null) {
             showChooseDialog = true
             showAutoLoginDialog = false
+            showChooseDialog()
+            return
+        }
+
+        if (!isAutoLogin) {
+            showChooseDialog = false
+            showAutoLoginDialog = false
+            showLoginView()
             return
         }
 
@@ -153,8 +160,9 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
             changeTimeNum()
             btnSwitch.setOnClickListener {
                 hideAutoLoginDialog()
-                showChooseDialog = true
-                showChooseDialog()
+//                showChooseDialog = true
+//                showChooseDialog()
+                showLoginView()
             }
             show()
         }
@@ -260,7 +268,7 @@ class LoginActivity : FragmentActivity(), View.OnClickListener {
             }
         })
 
-        loginContainer.visibility = View.GONE
+        hideLoginView()
     }
 
     private fun setTabBackground(left: Int, right: Int) {

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/Linking.kt

@@ -17,8 +17,13 @@ class Linking private constructor() {
 
     private val observers: MutableList<IEventObserver> = mutableListOf()
 
-    fun initialize(application: Application) {
-        observers.add(LinkingAdjustImpl())
+    fun initialize(application: Application, callback: OnTraceIdRead) {
+        observers.add(LinkingAdjustImpl(object : LinkingAdjustImpl.OnAdjustIdRead {
+            override fun onRead(id: String) {
+                callback.onAdjustIdRead(id)
+            }
+
+        }))
         observers.add(LinkingFirebaseImpl())
         observers.add(LinkingFacebookImpl())
 
@@ -95,10 +100,14 @@ class Linking private constructor() {
         }
     }
 
-
     companion object {
         val instance: Linking by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
             Linking()
         }
     }
+
+    interface OnTraceIdRead {
+
+        fun onAdjustIdRead(id: String)
+    }
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingAdjustImpl.kt

@@ -25,7 +25,7 @@ import java.io.InputStreamReader
  * @author #Suyghur.
  * Created on 2021/06/17
  */
-class LinkingAdjustImpl : IEventObserver {
+class LinkingAdjustImpl(val callback: OnAdjustIdRead) : IEventObserver {
 
     private var isInitSuccess = false
     private var sdkConfig: JSONObject? = null
@@ -57,6 +57,9 @@ class LinkingAdjustImpl : IEventObserver {
 
         val config = AdjustConfig(application, appId, environment, true)
         config.setLogLevel(LogLevel.VERBOSE)
+        config.setOnAttributionChangedListener {
+            callback.onRead(it.adid)
+        }
         Adjust.onCreate(config)
         if (MMKVUtils.instance.eventKV.decodeBool("adjust_activities")) {
             isInitSuccess = true
@@ -289,4 +292,8 @@ class LinkingAdjustImpl : IEventObserver {
         }
         return null
     }
+
+    interface OnAdjustIdRead {
+        fun onRead(id: String)
+    }
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingFacebookImpl.kt

@@ -186,5 +186,7 @@ class LinkingFacebookImpl : IEventObserver {
         }
         Logger.d("facebook log ext event ${sdkEvent.eventName} success")
     }
+
+
 }
 

library_core/src/main/java/cn/yyxx/eyuangame/core/linking/channel/LinkingFirebaseImpl.kt

@@ -161,4 +161,5 @@ class LinkingFirebaseImpl : IEventObserver {
         Firebase.analytics.logEvent(sdkEvent.eventName, null)
         Logger.d("firebase log ext event ${sdkEvent.eventName} success")
     }
+
 }