Commit de0fc700 authored by xw's avatar xw

[提交人]:王雪伟

[提交简述] :多多菜园1.0.9
[实现方案] :修改正式环境 删除log
parent b28c60f3
...@@ -97,7 +97,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -97,7 +97,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
val call: Call = client.newCall(request) val call: Call = client.newCall(request)
call.enqueue(object : Callback { call.enqueue(object : Callback {
override fun onFailure(call: Call, e: IOException) { override fun onFailure(call: Call, e: IOException) {
Log.d("wxwwww", "XiaoMan code:$ error $")
runOnUiThread { runOnUiThread {
callUnity("Canvas", "loadLoadingLandListSuccess", Utils.obj2Str(json)) callUnity("Canvas", "loadLoadingLandListSuccess", Utils.obj2Str(json))
} }
...@@ -230,7 +229,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -230,7 +229,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
* 上榜赚钱 * 上榜赚钱
*/ */
fun ranklistClick() { fun ranklistClick() {
Log.d("wxw", "上榜赚钱")
//JumpUtils.h5Jump("上榜赚钱", Constant.Param.RankList) //JumpUtils.h5Jump("上榜赚钱", Constant.Param.RankList)
JumpUtils.h5Jump("排行榜", MyConstant.Param.RankList, false, act) JumpUtils.h5Jump("排行榜", MyConstant.Param.RankList, false, act)
} }
...@@ -239,7 +237,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -239,7 +237,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
* 每日福利 * 每日福利
*/ */
fun oneveryDayWelfareClick() { fun oneveryDayWelfareClick() {
Log.d("wxw", "每日福利")
// JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false, act) // JumpUtils.h5Jump("每日福利", Constant.Param.WelfareCenter, false, act)
JumpUtils.jumpWelfareActivity() JumpUtils.jumpWelfareActivity()
} }
...@@ -248,7 +245,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -248,7 +245,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
* 打卡提现 * 打卡提现
*/ */
fun clockInMakeMoney() { fun clockInMakeMoney() {
Log.d("wxw", "打卡提现")
// JumpUtils.h5Jump("打卡提现", Constant.Param.PunchRecord, false, act) // JumpUtils.h5Jump("打卡提现", Constant.Param.PunchRecord, false, act)
JumpUtils.jumpClockInWithdrawActivity() JumpUtils.jumpClockInWithdrawActivity()
} }
...@@ -423,7 +419,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -423,7 +419,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
* 获取地块列表 土地列表 * 获取地块列表 土地列表
* */ * */
fun getListLandNew(from: Int) { fun getListLandNew(from: Int) {
Log.d("Wxw", "1初始化地块列表失败$from")
GameApiClient.gameApi.getListLand().compose(RxSchedulers.observableIO2Main()) GameApiClient.gameApi.getListLand().compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<NewLandListEntity>() { .subscribe(object : BaseObserver<NewLandListEntity>() {
override fun onSuccess(result: NewLandListEntity?) { override fun onSuccess(result: NewLandListEntity?) {
...@@ -443,7 +438,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -443,7 +438,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("Wxw", "初始化地块列表失败$from")
} }
}) })
} }
...@@ -504,7 +498,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -504,7 +498,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
"+${moneyNum}", "+${moneyNum}",
View.OnClickListener { View.OnClickListener {
GameEvent("click_receive_redPack_double", "点击六倍领取") GameEvent("click_receive_redPack_double", "点击六倍领取")
Log.d("wxw", "签到翻倍广告点击")
AdUtils.playRewardAd( AdUtils.playRewardAd(
this@GameActivity, this@GameActivity,
"receive_redPack_double_click", "receive_redPack_double_click",
...@@ -700,12 +693,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -700,12 +693,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
GameApiClient.gameApi.getUseAccelerators(id).compose(RxSchedulers.observableIO2Main()) GameApiClient.gameApi.getUseAccelerators(id).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))
callback?.onUseAcceleratorsSuccess(true, Utils.obj2Str(result)) callback?.onUseAcceleratorsSuccess(true, Utils.obj2Str(result))
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "加速剂 error")
callback?.onUseAcceleratorsSuccess(false, errorMsg + "") callback?.onUseAcceleratorsSuccess(false, errorMsg + "")
} }
}) })
...@@ -743,7 +734,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -743,7 +734,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
GameApiClient.gameApi.getWareHouseData(id).compose(RxSchedulers.observableIO2Main()) GameApiClient.gameApi.getWareHouseData(id).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<List<LandListEntity>>() { .subscribe(object : BaseObserver<List<LandListEntity>>() {
override fun onSuccess(result: List<LandListEntity>?) { override fun onSuccess(result: List<LandListEntity>?) {
Log.d("wxw", "仓库" + "{\"landList\":" + Utils.obj2Str(result) + "}")
callback?.onHomeWareListSuccess( callback?.onHomeWareListSuccess(
true, true,
"{\"landList\":" + Utils.obj2Str(result) + "}" "{\"landList\":" + Utils.obj2Str(result) + "}"
...@@ -751,7 +741,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -751,7 +741,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "仓库 error")
callback?.onHomeWareListSuccess(false, errorMsg + "") callback?.onHomeWareListSuccess(false, errorMsg + "")
} }
}) })
...@@ -770,7 +759,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -770,7 +759,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.subscribe(object : BaseObserver<List<HomeListEntity>>() { .subscribe(object : BaseObserver<List<HomeListEntity>>() {
override fun onSuccess(result: List<HomeListEntity>?) { override fun onSuccess(result: List<HomeListEntity>?) {
mOrderString = Utils.obj2Str(result) mOrderString = Utils.obj2Str(result)
Log.d("wxw", "订单数据" + Utils.obj2Str(result))
callback?.onOrderListSuccess( callback?.onOrderListSuccess(
true, true,
"{\"homeList\":" + Utils.obj2Str(result) + "}" "{\"homeList\":" + Utils.obj2Str(result) + "}"
...@@ -778,7 +766,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -778,7 +766,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "订单数据 error")
callback?.onOrderListSuccess(false, errorMsg + "") callback?.onOrderListSuccess(false, errorMsg + "")
} }
}) })
...@@ -789,12 +776,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -789,12 +776,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
GameApiClient.gameApi.getOrderReceive().compose(RxSchedulers.observableIO2Main()) GameApiClient.gameApi.getOrderReceive().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))
callback?.onOrderReceiveSuccess(true, Utils.obj2Str(result)) callback?.onOrderReceiveSuccess(true, Utils.obj2Str(result))
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "订单领取 error")
callback?.onOrderReceiveSuccess(false, errorMsg + "") callback?.onOrderReceiveSuccess(false, errorMsg + "")
} }
}) })
...@@ -852,7 +837,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -852,7 +837,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.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))
callUnity( callUnity(
"Form_land", "Form_land",
"onVideoSeedReceiveSuccess", "onVideoSeedReceiveSuccess",
...@@ -865,7 +849,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -865,7 +849,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
code: String?, code: String?,
errorMsg: String? errorMsg: String?
) { ) {
Log.d("wxw", "看视频领取种子同步 error")
} }
}) })
} }
...@@ -949,7 +932,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -949,7 +932,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.compose(RxSchedulers.observableIO2Main()) .compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<FlyBoxEntity>() { .subscribe(object : BaseObserver<FlyBoxEntity>() {
override fun onSuccess(result: FlyBoxEntity?) { override fun onSuccess(result: FlyBoxEntity?) {
Log.d("wxw", "底部拆红包" + Utils.obj2Str(result))
if (result != null) { if (result != null) {
var type = result.type var type = result.type
if (type != null) { if (type != null) {
...@@ -965,7 +947,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -965,7 +947,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "底部拆红包 error")
} }
}) })
} }
...@@ -1048,12 +1029,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -1048,12 +1029,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.subscribe(object : BaseObserver<AddCardEntity>() { .subscribe(object : BaseObserver<AddCardEntity>() {
override fun onSuccess(result: AddCardEntity?) { override fun onSuccess(result: AddCardEntity?) {
mOrderString = Utils.obj2Str(result) mOrderString = Utils.obj2Str(result)
Log.d("wxw", "收集卡片" + Utils.obj2Str(result))
callback?.onAddCardSuccess(true, Utils.obj2Str(result)) callback?.onAddCardSuccess(true, Utils.obj2Str(result))
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "收集卡片 error")
callback?.onAddCardSuccess(false, errorMsg + "") callback?.onAddCardSuccess(false, errorMsg + "")
} }
}) })
...@@ -1065,12 +1044,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -1065,12 +1044,10 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.subscribe(object : BaseObserver<PuzzleEntity>() { .subscribe(object : BaseObserver<PuzzleEntity>() {
override fun onSuccess(result: PuzzleEntity?) { override fun onSuccess(result: PuzzleEntity?) {
mOrderString = Utils.obj2Str(result) mOrderString = Utils.obj2Str(result)
Log.d("wxw", "查询卡片角标" + Utils.obj2Str(result))
callback?.onGetCardList(true, Utils.obj2Str(result)) callback?.onGetCardList(true, Utils.obj2Str(result))
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "查询卡片角标 error")
callback?.onGetCardList(false, errorMsg + "") callback?.onGetCardList(false, errorMsg + "")
} }
}) })
...@@ -1121,7 +1098,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -1121,7 +1098,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.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))
// callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result)) // callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result))
callUnity("Form_land", "showCloudSpeedAnim", "") callUnity("Form_land", "showCloudSpeedAnim", "")
getListLandNew(2) getListLandNew(2)
...@@ -1132,7 +1108,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -1132,7 +1108,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
code: String?, code: String?,
errorMsg: String? errorMsg: String?
) { ) {
Log.d("wxw", "云朵加速 error")
//callback?.onCloudSpeedSuccess(false, errorMsg + "") //callback?.onCloudSpeedSuccess(false, errorMsg + "")
} }
}) })
......
...@@ -52,19 +52,19 @@ class BaseApplication : BaseApplication() { ...@@ -52,19 +52,19 @@ class BaseApplication : BaseApplication() {
private var backToFrontTime: Long = 0 private var backToFrontTime: Long = 0
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
// NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/" NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
// NetConfig.BASE_AD_URL="https://bs.ihuomao.com/" NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
// NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/" NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
//TODO 上线去掉测试地址 //TODO 上线去掉测试地址
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 = true LogUtils.getConfig().logSwitch = false
UMConfigure.setLogEnabled(true) UMConfigure.setLogEnabled(false)
UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "") UMConfigure.init(this, "5f9bb48945b2b751a91fb2d5", "", UMConfigure.DEVICE_TYPE_PHONE, "")
PlatformConfig.setWeixin(MyConstant.WX_APPID, MyConstant.WX_APPKEY) PlatformConfig.setWeixin(MyConstant.WX_APPID, MyConstant.WX_APPKEY)
......
...@@ -321,12 +321,10 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -321,12 +321,10 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
.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", "看视频上报 Success")
mPresenter?.getTurntableLotteryResult() mPresenter?.getTurntableLotteryResult()
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
Log.d("wxw", "看视频上报 error")
} }
}) })
} }
......
...@@ -513,7 +513,6 @@ abstract class JavaInterface { ...@@ -513,7 +513,6 @@ abstract class JavaInterface {
@JavascriptInterface @JavascriptInterface
fun apiClientPost(url: String, tag: String) { fun apiClientPost(url: String, tag: String) {
Log.d("wxw", "url$url");
ApiClient.userApi.webApiPost(url).compose(RxSchedulers.observableIO2Main()) ApiClient.userApi.webApiPost(url).compose(RxSchedulers.observableIO2Main())
.subscribe(object : .subscribe(object :
Observer<Response<ResponseBody>> { Observer<Response<ResponseBody>> {
......
...@@ -97,7 +97,6 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter { ...@@ -97,7 +97,6 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter {
.subscribe(object : BaseObserver<VersionEntity?>() { .subscribe(object : BaseObserver<VersionEntity?>() {
override fun onSuccess(dataBean: VersionEntity?) { override fun onSuccess(dataBean: VersionEntity?) {
if (dataBean != null) { if (dataBean != null) {
Log.d("wxw", "version" + Utils.obj2Str(dataBean))
if (dataBean.vc > PhoneUtils.getAppVersionCode(AppliContext.get()) && "" != dataBean.dl_url) { if (dataBean.vc > PhoneUtils.getAppVersionCode(AppliContext.get()) && "" != dataBean.dl_url) {
mUrl = dataBean.dl_url mUrl = dataBean.dl_url
if (dataBean.type == 1) { if (dataBean.type == 1) {
......
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