• jyx's avatar
    Merge branch 'dev_gro_more_haotu' into dev_ad · 503e89c6
    jyx authored
    # Conflicts:
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ad/express/GroMoreCarrierExpressManager.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ad/express/GroMoreExpressManager.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ad/express/PreLoadExpressManager.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/CsjGroMoreVideoAdManager.java
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/manager/CsjAppLogManager.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/FoodSubsidyActivity.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MorningClockActivity.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SplashGroMoreActivity.java
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WalkActivity.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WaterActivity.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MainFragment.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
    #	GoodMoney/app/src/main/java/com/mints/goodmoney/utils/ForegroundOrBackground.java
    #	GoodMoney/build.gradle
    503e89c6