Skip to content

L
LuckyFarm
Commit 4a7fdcbd authored by wangxuewei's avatar wangxuewei
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：幸福农场
[实现方案] ：修改空指针
parent 994bd1f3
Show whitespace changes
Inline Side-by-side
Showing with 225 additions and 221 deletions
app/src/main/java/com/ym/game/GameActivity.kt
View file @ 4a7fdcbd
...@@ -508,65 +508,102 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback, NetStateCh ...@@ -508,65 +508,102 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback, NetStateCh
//看视频领取种子 //看视频领取种子
var videoSeedClick = true var videoSeedClick = true
fun getVideoSeedReceive(callback: IUnitySendMessageCallback?, id: Int) { fun getVideoSeedReceive(callback: IUnitySendMessageCallback?, id: Int) {
if (videoSeedClick) { // if (videoSeedClick) {
videoSeedClick = false // videoSeedClick = false
//
AdManager.loadRewardVideoAd( // AdManager.loadRewardVideoAd(
ADConfig.AD_REWARD_VIDIO, // ADConfig.AD_REWARD_VIDIO,
this, // this,
object : ZXADVideoListener { // object : ZXADVideoListener {
override fun onFail() { // override fun onFail() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onSuccess() { // override fun onSuccess() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onError() { // override fun onError() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onRewardVideoCached() { // override fun onRewardVideoCached() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun setRewardAdInteractionListener() { // override fun setRewardAdInteractionListener() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onRewardVerify() { // override fun onRewardVerify() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onVideoError() { // override fun onVideoError() {
// showToponWaterVideo() //// showToponWaterVideo()
videoSeedClick = true // videoSeedClick = true
//
} // }
//
override fun onRewardVideoAdLoad() { // override fun onRewardVideoAdLoad() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onRewardVideoAdLoad(entity: NewsEntity) { // override fun onRewardVideoAdLoad(entity: NewsEntity) {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onAdShow() { // override fun onAdShow() {
videoSeedClick = true // videoSeedClick = true
} // }
//
override fun onAdVideoBarClick(newsEntity: NewsEntity) { // override fun onAdVideoBarClick(newsEntity: NewsEntity) {
videoSeedClick = true // videoSeedClick = true
} // }
//
// override fun onAdClose() {
// videoSeedClick = true
// //看视频上报
// getVideoAcceleratorsReceive();
// GameApiClient.gameApi.getVideoSeedReceive(id)
// .compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<StatusEntity>() {
// override fun onSuccess(result: StatusEntity?) {
// result?.id = id
// Log.d("wxw", "看视频领取种子" + Utils.obj2Str(result))
// callback?.onIncrVideoSeedSuccess(true, Utils.obj2Str(result))
// }
//
// override fun onFailure(
// e: Throwable?,
// code: String?,
// errorMsg: String?
// ) {
// Log.d("wxw", "看视频领取种子 error")
// callback?.onIncrVideoSeedSuccess(false, errorMsg + "")
// }
// })
// }
//
// override fun onVideoComplete() {
// videoSeedClick = true
// }
//
// override fun onSkippedVideo() {
// videoSeedClick = true
// }
//
// override fun onFullScreenVideoCached() {
// videoSeedClick = true
// }
//
// override fun onLoadVideoAd(rewardVideoAD: ZXADRewardVideo) {
// videoSeedClick = true
// }
// })
// }
override fun onAdClose() { GameApiClient.gameApi.getVideoSeedReceive(id).compose(RxSchedulers.observableIO2Main())
videoSeedClick = true
//看视频上报
getVideoAcceleratorsReceive();
GameApiClient.gameApi.getVideoSeedReceive(id)
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<StatusEntity>() { .subscribe(object : BaseObserver<StatusEntity>() {
override fun onSuccess(result: StatusEntity?) { override fun onSuccess(result: StatusEntity?) {
result?.id = id result?.id = id
...@@ -574,163 +611,125 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback, NetStateCh ...@@ -574,163 +611,125 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback, NetStateCh
callback?.onIncrVideoSeedSuccess(true, Utils.obj2Str(result)) callback?.onIncrVideoSeedSuccess(true, Utils.obj2Str(result))
} }
override fun onFailure( override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
e: Throwable?,
code: String?,
errorMsg: String?
) {
Log.d("wxw", "看视频领取种子 error") Log.d("wxw", "看视频领取种子 error")
callback?.onIncrVideoSeedSuccess(false, errorMsg + "") callback?.onIncrVideoSeedSuccess(false, errorMsg + "")
} }
}) })
} }
override fun onVideoComplete() { var videoJiasuClick = true
videoSeedClick = true
}
override fun onSkippedVideo() {
videoSeedClick = true
}
override fun onFullScreenVideoCached() {
videoSeedClick = true
}
override fun onLoadVideoAd(rewardVideoAD: ZXADRewardVideo) {
videoSeedClick = true
}
})
}
// GameApiClient.gameApi.getVideoSeedReceive(id).compose(RxSchedulers.observableIO2Main()) //看视频领取加速剂
fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?, id: Int) {
// if (videoJiasuClick) {
// videoJiasuClick = false
// AdManager.loadRewardVideoAd(
// ADConfig.AD_REWARD_VIDIO,
// this,
// object : ZXADVideoListener {
// override fun onFail() {
// videoJiasuClick = true
// }
//
// override fun onSuccess() {
// videoJiasuClick = true
// }
//
// override fun onError() {
// videoJiasuClick = true
// }
//
// override fun onRewardVideoCached() {
// videoJiasuClick = true
// }
//
// override fun setRewardAdInteractionListener() {
// videoJiasuClick = true
// }
//
// override fun onRewardVerify() {
// videoJiasuClick = true
// }
//
// override fun onVideoError() {
//// showToponWaterVideo()
// videoJiasuClick = true
// }
//
// override fun onRewardVideoAdLoad() {
// videoJiasuClick = true
// }
//
// override fun onRewardVideoAdLoad(entity: NewsEntity) {
// videoJiasuClick = true
// }
//
// override fun onAdShow() {
// videoJiasuClick = true
// }
//
// override fun onAdVideoBarClick(newsEntity: NewsEntity) {
// videoJiasuClick = true
// }
//
// override fun onAdClose() {
// videoJiasuClick = true
// //看视频上报
// getVideoAcceleratorsReceive();
// GameApiClient.gameApi.getVideoAcceleratorsReceive(id)
// .compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<StatusEntity>() { // .subscribe(object : BaseObserver<StatusEntity>() {
// override fun onSuccess(result: StatusEntity?) { // override fun onSuccess(result: StatusEntity?) {
// result?.id = id // Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result))
// Log.d("wxw", "看视频领取种子" + Utils.obj2Str(result)) // callback?.onIncrVideoAcceleratorsSuccess(
// callback?.onIncrVideoSeedSuccess(true, Utils.obj2Str(result)) // true,
// Utils.obj2Str(result)
// )
// } // }
// //
// override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { // override fun onFailure(
// Log.d("wxw", "看视频领取种子 error") // e: Throwable?,
// callback?.onIncrVideoSeedSuccess(false, errorMsg + "") // code: String?,
// errorMsg: String?
// ) {
// Log.d("wxw", "看视频领取加速剂 error")
// callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "")
// } // }
// }) // })
} // }
//
var videoJiasuClick = true // override fun onVideoComplete() {
// videoJiasuClick = true
//看视频领取加速剂 // }
fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?, id: Int) { //
if (videoJiasuClick) { // override fun onSkippedVideo() {
videoJiasuClick = false // videoJiasuClick = true
AdManager.loadRewardVideoAd( // }
ADConfig.AD_REWARD_VIDIO, //
this, // override fun onFullScreenVideoCached() {
object : ZXADVideoListener { // videoJiasuClick = true
override fun onFail() { // }
videoJiasuClick = true //
} // override fun onLoadVideoAd(rewardVideoAD: ZXADRewardVideo) {
// videoJiasuClick = true
override fun onSuccess() { // }
videoJiasuClick = true // })
} // }
override fun onError() {
videoJiasuClick = true
}
override fun onRewardVideoCached() {
videoJiasuClick = true
}
override fun setRewardAdInteractionListener() {
videoJiasuClick = true
}
override fun onRewardVerify() {
videoJiasuClick = true
}
override fun onVideoError() {
// showToponWaterVideo()
videoJiasuClick = true
}
override fun onRewardVideoAdLoad() {
videoJiasuClick = true
}
override fun onRewardVideoAdLoad(entity: NewsEntity) {
videoJiasuClick = true
}
override fun onAdShow() {
videoJiasuClick = true
}
override fun onAdVideoBarClick(newsEntity: NewsEntity) {
videoJiasuClick = true
}
override fun onAdClose() {
videoJiasuClick = true
//看视频上报
getVideoAcceleratorsReceive();
GameApiClient.gameApi.getVideoAcceleratorsReceive(id) GameApiClient.gameApi.getVideoAcceleratorsReceive(id)
.compose(RxSchedulers.observableIO2Main()) .compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<StatusEntity>() { .subscribe(object : BaseObserver<StatusEntity>() {
override fun onSuccess(result: StatusEntity?) { override fun onSuccess(result: StatusEntity?) {
Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result)) Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result))
callback?.onIncrVideoAcceleratorsSuccess( callback?.onIncrVideoAcceleratorsSuccess(true, Utils.obj2Str(result))
true,
Utils.obj2Str(result)
)
} }
override fun onFailure( override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
e: Throwable?,
code: String?,
errorMsg: String?
) {
Log.d("wxw", "看视频领取加速剂 error") Log.d("wxw", "看视频领取加速剂 error")
callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "") callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "")
} }
}) })
}
override fun onVideoComplete() {
videoJiasuClick = true
}
override fun onSkippedVideo() {
videoJiasuClick = true
}
override fun onFullScreenVideoCached() {
videoJiasuClick = true
}
override fun onLoadVideoAd(rewardVideoAD: ZXADRewardVideo) {
videoJiasuClick = true
}
})
}
// GameApiClient.gameApi.getVideoAcceleratorsReceive(id)
// .compose(RxSchedulers.observableIO2Main())
// .subscribe(object : BaseObserver<StatusEntity>() {
// override fun onSuccess(result: StatusEntity?) {
// Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result))
// callback?.onIncrVideoAcceleratorsSuccess(true, Utils.obj2Str(result))
// }
//
// override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
// Log.d("wxw", "看视频领取加速剂 error")
// callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "")
// }
// })
} }
......
app/src/main/java/com/ym/game/activity/SplashActivity.kt
View file @ 4a7fdcbd
...@@ -101,11 +101,11 @@ class SplashActivity : BaseActivity(), SplashContract.View { ...@@ -101,11 +101,11 @@ class SplashActivity : BaseActivity(), SplashContract.View {
} }
override fun onAdClicked(data: NewsEntity) { override fun onAdClicked(data: NewsEntity) {
Log.e("huang", "onAdClicked()")
} }
override fun onAdShow(data: NewsEntity) { override fun onAdShow(data: NewsEntity) {
Log.e("huang", "onAdShow()")
} }
override fun onAdSkip() { override fun onAdSkip() {
......
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @ 4a7fdcbd
...@@ -31,7 +31,7 @@ class BaseApplication : MultiDexApplication() { ...@@ -31,7 +31,7 @@ class BaseApplication : MultiDexApplication() {
//第一步初始化 application //第一步初始化 application
AppliContext.init(this) AppliContext.init(this)
Config.init(this) Config.init(this)
NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
Constant.appLs = "a03d5320d905cf3b"//appls Constant.appLs = "a03d5320d905cf3b"//appls
AdManager.init(//TODO 替换id AdManager.init(//TODO 替换id
......
app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt
View file @ 4a7fdcbd
...@@ -121,7 +121,6 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View, ...@@ -121,7 +121,6 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
3 -> dismiss() 3 -> dismiss()
6 -> { 6 -> {
dismiss() dismiss()
EventUtils.onEvent("click_welfare_task_video_btn","福利任务视频")
JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false) JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false)
} }
4 -> { 4 -> {
......
library/src/main/java/com/ym/library/utils/WxImplUtils.java
View file @ 4a7fdcbd
...@@ -83,9 +83,11 @@ public class WxImplUtils implements UMAuthListener { ...@@ -83,9 +83,11 @@ public class WxImplUtils implements UMAuthListener {
} }
UserInfoEntity user = SettingPreference.getUserInfoData(); UserInfoEntity user = SettingPreference.getUserInfoData();
if (user!=null){
user.setBind(true); user.setBind(true);
user.setHeadimgurl(data.get("iconurl")); user.setHeadimgurl(data.get("iconurl"));
user.setNickname(data.get("screen_name")); user.setNickname(data.get("screen_name"));
}
SettingPreference.saveUserInfo(user); SettingPreference.saveUserInfo(user);
SettingPreference.saveUserInfoName(data.get("screen_name")); SettingPreference.saveUserInfoName(data.get("screen_name"));
mCallback.onWxSuccess(data.get("access_token"), data.get("openid")); mCallback.onWxSuccess(data.get("access_token"), data.get("openid"));
......
library/src/main/res/layout/activity_webview.xml
View file @ 4a7fdcbd
...@@ -35,5 +35,9 @@ ...@@ -35,5 +35,9 @@
android:id="@+id/activity_webview_layout" android:id="@+id/activity_webview_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" /> android:orientation="horizontal" >
</LinearLayout>
</LinearLayout> </LinearLayout>
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