Merge remote-tracking branch 'origin/develop_luckyfarm_1.0.1' into develop_luckyfarm_1.0.1

f43a4edd · wangxuewei · 5649d494 · 332c9fb7 · f43a4edd · f43a4edd
Commit f43a4edd authored Oct 23, 2020 by wangxuewei
Showing with 135 additions and 133 deletions

BaseApplication.kt app/src/main/java/com/ym/game/application/BaseApplication.kt +2 -2

SplashPresenter.kt library/src/main/java/com/ym/library/net/SplashPresenter.kt +133 -131

No files found.
--- a/app/src/main/java/com/ym/game/application/BaseApplication.kt
+++ b/app/src/main/java/com/ym/game/application/BaseApplication.kt
@@ -30,8 +30,8 @@ class BaseApplication : MultiDexApplication() {
        super.onCreate()
        //第一步初始化 application
        AppliContext.init(this)
-        Config.init(this)
-        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+       // Config.init(this)
+        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT

        Constant.appLs = "a03d5320d905cf3b"//appls
        AdManager.init(//TODO 替换id

--- a/library/src/main/java/com/ym/library/net/SplashPresenter.kt
+++ b/library/src/main/java/com/ym/library/net/SplashPresenter.kt