Browse Source

dev开发:测试jenkins构建2

#Suyghur 3 years ago
parent
commit
ded7e7dca1

+ 6 - 5
library_core/build.gradle

@@ -96,11 +96,12 @@ dependencies {
     //adjust
     implementation 'com.adjust.sdk:adjust-android:4.28.2'
 
-    if (PUBLISH_ENABLE) {
-        api files('../libs/eyuangamesdk_base_1.0.0.jar')
-    } else {
-        api project(':library_base')
-    }
+//    if (PUBLISH_ENABLE) {
+//        api files('../libs/eyuangamesdk_base_1.0.0.jar')
+//    } else {
+//        api project(':library_base')
+//    }
+    api files('libs/eyuangamesdk_base_1.0.0.jar')
 }
 
 apply from: 'publish.gradle'

BIN
library_core/libs/eyuangamesdk_base_1.0.0.jar


+ 11 - 1
library_core/src/main/java/cn/yyxx/eyuangame/core/entity/bean/init/FloatCfg.kt

@@ -20,7 +20,17 @@ class FloatCfg {
     lateinit var inviteCfg: FeatureCfg
 
     override fun toString(): String {
-        return "FloatCfg(switch=$switch, floatIconUrl='$floatIconUrl', memberCfg=$memberCfg, gifCfg=$gifCfg, gmCfg=$gmCfg, chargeCfg=$chargeCfg, inviteCfg=$inviteCfg)"
+        return "FloatCfg(" +
+                "switch=$switch, " +
+                "floatIconUrl='$floatIconUrl', " +
+                "floatIconLeftUrl='$floatIconLeftUrl', " +
+                "floatIconRightUrl='$floatIconRightUrl', " +
+                "memberCfg=$memberCfg, " +
+                "gifCfg=$gifCfg, " +
+                "gmCfg=$gmCfg, " +
+                "chargeCfg=$chargeCfg, " +
+                "inviteCfg=$inviteCfg" +
+                ")"
     }
 
     companion object {

+ 2 - 2
library_core/src/main/java/cn/yyxx/eyuangame/core/impl/login/fragment/LauncherFragment.kt

@@ -327,8 +327,8 @@ class LauncherFragment : Fragment(), View.OnClickListener {
             dismiss()
             agreementDialog = null
         }
-//                agreementDialog = AgreementDialog(requireContext(), SdkBridgeImpl.initBean.privacyCfg.url, SdkBridgeImpl.isLand)
-        agreementDialog = AgreementDialog(requireContext(), "http://www.eyuangame.com/agreement_user.html", SdkBridgeImpl.isLand)
+        agreementDialog = AgreementDialog(requireContext(), SdkBridgeImpl.initBean.privacyCfg.url, SdkBridgeImpl.isLand)
+//        agreementDialog = AgreementDialog(requireContext(), "http://www.eyuangame.com/agreement_user.html", SdkBridgeImpl.isLand)
         agreementDialog?.apply {
             loginImpl.hideLoginView()
             ivReturn.setOnClickListener {