Commit ea4b9694 authored by Li's avatar Li

[李俊岐] 优化

parent 365fc901
...@@ -5,21 +5,22 @@ import android.app.Dialog ...@@ -5,21 +5,22 @@ import android.app.Dialog
import android.content.ComponentName import android.content.ComponentName
import android.content.Intent import android.content.Intent
import android.content.ServiceConnection import android.content.ServiceConnection
import android.content.pm.ActivityInfo
import android.os.Bundle import android.os.Bundle
import android.os.IBinder import android.os.IBinder
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.view.WindowManager
import com.bx.adsdk.AdSdk import com.bx.adsdk.AdSdk
import com.game.luckyfarm.UnityPlayerActivity import com.game.luckyfarm.UnityPlayerActivity
import com.gyf.immersionbar.ImmersionBar
import com.umeng.analytics.MobclickAgent import com.umeng.analytics.MobclickAgent
import com.ym.admodule.config.AdManager import com.ym.ddcy.R
import com.ym.admodule.config.ZXADSizeConfig
import com.ym.game.activity.WxLoginActivity import com.ym.game.activity.WxLoginActivity
import com.ym.game.listener.IDialogViewCloseCallback import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.notif.NotificationService import com.ym.game.notif.NotificationService
import com.ym.game.view.* import com.ym.game.view.*
import com.ym.modulecommon.AppliContext
import com.ym.library.Constant import com.ym.library.Constant
import com.ym.library.down.UpdateVersionManager import com.ym.library.down.UpdateVersionManager
import com.ym.library.listener.IAdVideoListener import com.ym.library.listener.IAdVideoListener
...@@ -28,15 +29,13 @@ import com.ym.library.net.ApiClient ...@@ -28,15 +29,13 @@ import com.ym.library.net.ApiClient
import com.ym.library.net.BaseObserver import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers import com.ym.library.net.RxSchedulers
import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.utils.* import com.ym.library.utils.*
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.module.UserInfoEntity import com.ym.modulecommon.module.UserInfoEntity
import io.reactivex.Observable import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.android.schedulers.AndroidSchedulers
import org.jetbrains.anko.act import org.jetbrains.anko.act
import java.lang.reflect.Method import java.lang.reflect.Method
import kotlin.math.log
/** /**
* @author (wangXuewei) * @author (wangXuewei)
...@@ -50,6 +49,9 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -50,6 +49,9 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
@SuppressLint("CheckResult") @SuppressLint("CheckResult")
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
StatusBarUtils.transportStatus(this, resources.getColor(R.color.transparent))
requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // 禁用横屏
window.addFlags(WindowManager.LayoutParams.FLAG_SECURE) //禁止截屏
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
EventUtils.onEvent("tab_imp", "多多菜园") EventUtils.onEvent("tab_imp", "多多菜园")
if (SettingPreference.getIsShowGuide()) { if (SettingPreference.getIsShowGuide()) {
......
...@@ -99,7 +99,6 @@ class WelfareTaskAdpater : ...@@ -99,7 +99,6 @@ class WelfareTaskAdpater :
holder?.tvStatus.text = "已领取" holder?.tvStatus.text = "已领取"
} }
2 -> { 2 -> {
holder?.layoutStatus?.clearAnimation()
holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_receive) holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_receive)
holder?.tvStatus.text = "立即领取" holder?.tvStatus.text = "立即领取"
} }
......
...@@ -20,6 +20,7 @@ import com.umeng.socialize.PlatformConfig ...@@ -20,6 +20,7 @@ import com.umeng.socialize.PlatformConfig
import com.ym.admodule.config.AdManager import com.ym.admodule.config.AdManager
import com.ym.library.Constant import com.ym.library.Constant
import com.ym.modulecommon.AppliContext import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.base.BaseApplication
import com.ym.modulecommon.base.SplashResumeActivity import com.ym.modulecommon.base.SplashResumeActivity
import com.ym.modulecommon.net.NetConfig import com.ym.modulecommon.net.NetConfig
import com.ym.modulecommon.utils.LogUtils import com.ym.modulecommon.utils.LogUtils
...@@ -27,7 +28,7 @@ import java.io.BufferedReader ...@@ -27,7 +28,7 @@ import java.io.BufferedReader
import java.io.FileReader import java.io.FileReader
import java.io.IOException import java.io.IOException
class BaseApplication : MultiDexApplication() { class BaseApplication : BaseApplication() {
// 正常状态 // 正常状态
val STATE_NORMAL = 0 val STATE_NORMAL = 0
...@@ -63,7 +64,7 @@ class BaseApplication : MultiDexApplication() { ...@@ -63,7 +64,7 @@ class BaseApplication : MultiDexApplication() {
NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/" NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
// Constant.appLs = "afcbef40e31631d3"//appls // Constant.appLs = "afcbef40e31631d3"//appls
AdManager.init(this,"afcbef40e31631d3") AdManager.init(this,"afcbef40e31631d3")
LogUtils.getConfig().logSwitch = false LogUtils.getConfig().logSwitch = true
UMConfigure.setLogEnabled(true) UMConfigure.setLogEnabled(true)
UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "") UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "")
PlatformConfig.setWeixin(Constant.WX_APPID, Constant.WX_APPKEY) PlatformConfig.setWeixin(Constant.WX_APPID, Constant.WX_APPKEY)
......
...@@ -67,7 +67,7 @@ dependencies { ...@@ -67,7 +67,7 @@ dependencies {
api ("com.bx:adsdk:1.3.3"){ api ("com.bx:adsdk:1.3.3"){
exclude group: 'com.google.code.gson' exclude group: 'com.google.code.gson'
} }
api 'com.ym.admodule:admodule:1.0.2.23' api 'com.ym.admodule:admodule:1.0.2.28'
api 'com.airbnb.android:lottie:3.1.0' api 'com.airbnb.android:lottie:3.1.0'
/* api 'androidx.appcompat:appcompat:1.2.0-alpha02' /* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
api 'com.android.support:design:28.0.0' api 'com.android.support:design:28.0.0'
......
...@@ -46,6 +46,7 @@ public abstract class BaseActivity extends RxAppCompatActivity { ...@@ -46,6 +46,7 @@ public abstract class BaseActivity extends RxAppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); // 禁用横屏 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); // 禁用横屏
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
RxBusUtil.getDefault().register(this); RxBusUtil.getDefault().register(this);
before(); before();
if (layoutID() != 0) { if (layoutID() != 0) {
......
...@@ -15,7 +15,7 @@ import com.ym.modulecommon.AppliContext ...@@ -15,7 +15,7 @@ import com.ym.modulecommon.AppliContext
import java.lang.Exception import java.lang.Exception
object AdUtils { object AdUtils {
val TAG = "AdUtils"
fun playRewardAd(activity: Activity, actionName: String, listener: IAdVideoListener) { fun playRewardAd(activity: Activity, actionName: String, listener: IAdVideoListener) {
AdManager.playRewardAd( AdManager.playRewardAd(
ADConfig.AD_REWARD_VIDIO, ADConfig.AD_REWARD_VIDIO,
...@@ -37,10 +37,13 @@ object AdUtils { ...@@ -37,10 +37,13 @@ object AdUtils {
// AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_VIDEO, activity!!) // AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_VIDEO, activity!!)
} }
override fun onAdVideoBarClick() {} override fun onAdVideoBarClick() {
Log.d(TAG,"onAdVideoBarClick:")
}
override fun onError(errorMsg: String?) { override fun onError(errorMsg: String?) {
listener?.onError(errorMsg) listener?.onError(errorMsg)
Log.d(TAG,"onError:" + errorMsg)
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment