v1.0.3开发：调整base的混淆规则

config.gradle

@@ -3,7 +3,7 @@ ext {
     module = [
             remoteLib    : false,
             minifyEnabled: true,
-            publish      : true,
+            publish      : false,
             language     : 1
     ]
 

library_base/build.gradle

@@ -49,8 +49,7 @@ android {
 
 dependencies {
     api files('../libs/yyxx_support_1.0.2.jar')
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'io.github.suyghur.dolin:zap:1.0.0'
+    compileOnly 'io.github.suyghur.dolin:zap:1.0.0'
 }
 
 apply from: 'buildJar.gradle'

library_base/proguard-rules.pro

@@ -143,5 +143,6 @@
 -keep class cn.yyxx.eyuangame.base.utils.Logger{public <fields>; public <methods>;}
 -keep class cn.yyxx.eyuangame.base.utils.ParamsUtils{public <fields>; public <methods>;}
 -keep class cn.yyxx.eyuangame.base.EYuanGame{public <fields>; public <methods>;}
+-keep class cn.yyxx.eyuangame.base.EYuanGame$Companion{*;}
 -keep class cn.yyxx.eyuangame.base.EYuanGameApplication{public <fields>; public <methods>;}
 -keep class cn.yyxx.eyuangame.Version{public <fields>; public <methods>;}

library_base/src/main/java/cn/yyxx/eyuangame/base/EYuanGame.kt

@@ -7,7 +7,6 @@ import android.content.Intent
 import android.os.Build
 import android.text.TextUtils
 import android.webkit.WebView
-import androidx.annotation.Keep
 import cn.yyxx.eyuangame.Version
 import cn.yyxx.eyuangame.base.entity.Function
 import cn.yyxx.eyuangame.base.entity.SdkChargeInfo
@@ -104,7 +103,7 @@ class EYuanGame private constructor() {
 
         //有些CP在资源再加时候回重复调用初始化，这里拦截一下
         if (doSdkInit) {
-            Logger.e("Columbus initialize 已经执行，拦截此次调用")
+            Logger.e("EYuanGame initialize 已经执行，拦截此次调用")
             return
         }
 
@@ -442,15 +441,13 @@ class EYuanGame private constructor() {
     }
 
     companion object {
+        private const val CLICK_INTERVAL: Int = 1500
+
         @JvmStatic
-        @Keep
         fun getInstance(): EYuanGame {
             return EYuanGameHolder.INSTANCE
         }
 
-        private const val CLICK_INTERVAL: Int = 1500
-
-        @Keep
         private object EYuanGameHolder {
             val INSTANCE: EYuanGame = EYuanGame()
         }
@@ -458,7 +455,6 @@ class EYuanGame private constructor() {
         /**
          * 防止单例对象在反序列化时重新生成对象
          */
-        @Keep
         private fun readResolve(): Any {
             return EYuanGameHolder.INSTANCE
         }

library_base/src/main/java/cn/yyxx/eyuangame/base/EYuanGameApplication.kt

@@ -1,12 +1,7 @@
 package cn.yyxx.eyuangame.base
 
-import android.annotation.TargetApi
 import android.app.Application
 import android.content.Context
-import android.os.Build
-import android.os.LocaleList
-import cn.yyxx.support.multidex.MultiDex
-import java.util.*
 
 /**
  * @author #Suyghur.
@@ -15,38 +10,12 @@ import java.util.*
 open class EYuanGameApplication : Application() {
 
     override fun attachBaseContext(base: Context) {
-        val context = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            updateResources(base)
-        } else {
-            base
-        }
-        super.attachBaseContext(context)
-//        MultiDex.install(context)
-        EYuanGame.getInstance().attachBaseContext(this, context)
+        super.attachBaseContext(base)
+        EYuanGame.getInstance().attachBaseContext(this, base)
     }
 
     override fun onCreate() {
         super.onCreate()
         EYuanGame.getInstance().initApplication(this)
     }
-
-    @TargetApi(Build.VERSION_CODES.N)
-    private fun updateResources(context: Context): Context {
-        val resources = context.resources
-        val locale = Locale.forLanguageTag("vi-VN")
-        val configuration = resources.configuration
-        configuration.setLocale(locale)
-        configuration.setLocales(LocaleList(locale))
-        return context.createConfigurationContext(configuration)
-    }
-
-//    override fun createConfigurationContext(overrideConfiguration: Configuration): Context {
-//        val locale = Locale("vi")
-//        Locale.setDefault(locale)
-////        val config = resources.configuration
-////        config.setLocale(locale)
-////        resources.updateConfiguration(config)
-//        overrideConfiguration.setLocale(locale)
-//        return super.createConfigurationContext(overrideConfiguration)
-//    }
 }

library_base/src/main/java/cn/yyxx/eyuangame/base/entity/Function.kt

@@ -5,7 +5,6 @@ package cn.yyxx.eyuangame.base.entity
  * Created on 2021/06/09
  */
 object Function {
-
     const val ATTACH_BASE_CONTEXT = "attachBaseContext"
     const val INIT_APPLICATION = "initApplication"
     const val INITIALIZE = "initialize"
@@ -13,8 +12,6 @@ object Function {
     const val LOGOUT = "logout"
     const val CHARGE = "charge"
     const val OPEN_EXIT_VIEW = "openExitView"
-    const val OPEN_BIND_ACCOUNT = "openBindAccount"
-    const val OPEN_GM_CENTER = "openGmCenter"
     const val ROLE_CREATE = "roleCreate"
     const val ROLE_LAUNCHER = "roleLauncher"
     const val ROLE_LEVEL_UP = "roleLevelUp"
@@ -26,14 +23,7 @@ object Function {
     const val ON_DESTROY = "onDestroy"
     const val ON_NEW_INTENT = "onNewIntent"
     const val ON_ACTIVITY_RESULT = "onActivityResult"
-    const val ON_CONFIGURATION_CHANGED = "onConfigurationChanged"
-    const val ON_REQUEST_PERMISSIONS_RESULT = "onRequestPermissionsResult"
     const val GET_CURRENT_USER_ID = "getCurrentUserId"
-    const val GET_CURRENT_SDK_VERSION = "getCurrentSdkVersion"
-    const val HAS_BIND_ACCOUNT = "hasBindAccount"
-    const val IS_GM_CENTER_ENABLE = "isGmCenterEnable"
-    const val INVOKE_SDK_SHARING = "invokeSdkSharing"
     const val LINKING_EVENT="linkingEvent"
     const val SHARE="share"
-
 }

library_core/src/main/java/cn/yyxx/eyuangame/core/SdkBridge.kt

@@ -15,7 +15,7 @@ import cn.yyxx.eyuangame.core.impl.SdkBridgeImpl
  * @author #Suyghur.
  * Created on 2021/06/09
  */
-class SdkBridge constructor() {
+class SdkBridge {
 
     private var mImpl: SdkBridgeImpl? = null