Skip to content

L
LuckyFarm
Commit 491070d2 authored by Li's avatar Li
Browse files
Options

[李俊岐] [美食大亨]提交

parent d29605c5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3180 additions and 1167 deletions
app/src/main/AndroidManifest.xml
View file @ 491070d2
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.ym.ddcy">
package="com.ym.msdh">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
......@@ -14,7 +14,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<application
android:name="com.ym.game.application.BaseApplication"
android:name="com.ym.msdh.game.application.BaseApplication"
android:allowBackup="true"
android:icon="@mipmap/icon_launch"
android:label="@string/app_name"
......@@ -24,7 +24,7 @@
android:theme="@style/AppTheme"
tools:replace="android:icon, android:label,android:theme">
<activity
android:name="com.ym.game.activity.WelfareActivity"
android:name="com.ym.msdh.game.activity.WelfareActivity"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -34,12 +34,12 @@
<data
android:host="welfare"
android:scheme="ddcy" />
android:scheme="msdh" />
</intent-filter>
</activity>
<activity
android:name="com.ym.game.activity.ClockInWithdrawActitivy"
android:name="com.ym.msdh.game.activity.ClockInWithdrawActitivy"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -49,7 +49,7 @@
<data
android:host="clockinwithdraw"
android:scheme="ddcy" />
android:scheme="msdh" />
</intent-filter>
</activity>
......@@ -64,7 +64,7 @@
android:value="portrait|landscape" />
<activity
android:name="com.ym.game.activity.SplashActivity"
android:name="com.ym.msdh.game.activity.SplashActivity"
android:noHistory="false"
android:theme="@style/SplashTheme">
<intent-filter>
......@@ -74,13 +74,13 @@
</intent-filter>
</activity>
<service android:name="com.ym.game.notif.NotificationService" />
<service android:name="com.ym.msdh.game.notif.NotificationService" />
<activity
android:name="com.ym.game.activity.WxLoginActivity"
android:name="com.ym.msdh.game.activity.WxLoginActivity"
android:exported="true" />
<activity
android:name="com.ym.game.GameActivity"
android:name="com.ym.msdh.game.GameActivity"
android:exported="true"
android:launchMode="singleTask" /> <!-- 友盟配置 -->
<meta-data
......
app/src/main/java/com/ym/game/activity/AdVideoListener.java → app/src/main/java/com/ym/msdh/game/activity/AdVideoListener.java
View file @ 491070d2
package com.ym.game.activity;
package com.ym.msdh.game.activity;
public abstract class AdVideoListener {
......
app/src/main/java/com/ym/game/activity/ClockInWithdrawActitivy.kt → app/src/main/java/com/ym/msdh/game/activity/ClockInWithdrawActitivy.kt
View file @ 491070d2
package com.ym.game.activity
package com.ym.msdh.game.activity
import android.app.Dialog
import android.text.Html
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import com.ym.ddcy.R
import com.ym.game.adapter.ClockInWithdrawAdpater
import com.ym.game.contract.ClockInWithdrawContract
import com.ym.game.presenter.ClockInWithdrawPresenter
import com.ym.game.view.MainDialog
import com.ym.msdh.game.adapter.ClockInWithdrawAdpater
import com.ym.msdh.game.contract.ClockInWithdrawContract
import com.ym.msdh.game.presenter.ClockInWithdrawPresenter
import com.ym.msdh.game.view.MainDialog
import com.ym.library.Constant
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.module.ExchangeEntity
import com.ym.library.net.BaseActivity
import com.ym.library.utils.CenterDialog
import com.ym.library.utils.EventUtils
import com.ym.msdh.R
import kotlinx.android.synthetic.main.activity_clock_in_withdraw.*
//打卡提现 福利
......@@ -77,7 +77,7 @@ class ClockInWithdrawActitivy : BaseActivity(), ClockInWithdrawContract.View,
Constant.videoNum = result?.videoNum ?: 20
tv_clock_in_days?.text =
Html.fromHtml("已连续打卡 <font color=\"#8F2C0F\"><big>${result?.clockNum}</big></font> 天")
Html.fromHtml("已连续打卡 <font color=\"#EF680D\"><big> ${result?.clockNum} </big></font> 天")
tv_clock_in_info?.text = "${result?.title}"
mAdapter?.clear()
......
app/src/main/java/com/ym/game/activity/SplashActivity.kt → app/src/main/java/com/ym/msdh/game/activity/SplashActivity.kt
View file @ 491070d2
package com.ym.game.activity
package com.ym.msdh.game.activity
import android.app.Activity
import android.content.Intent
......@@ -12,9 +12,9 @@ import com.gyf.immersionbar.ImmersionBar
import com.umeng.analytics.MobclickAgent
import com.ym.admodule.config.AdManager
import com.ym.admodule.listener.ZXADSplashListener
import com.ym.ddcy.R
import com.ym.game.GameActivity
import com.ym.game.utils.CenterDialog
import com.ym.msdh.game.GameActivity
import com.ym.msdh.game.utils.CenterDialog
import com.ym.library.Constant
import com.ym.library.module.ReportEntity
import com.ym.library.net.PermissionsActivity
......@@ -23,6 +23,7 @@ import com.ym.library.net.SplashPresenter
import com.ym.library.net.SplashPresenter.Companion.PERMISSIONS
import com.ym.library.utils.*
import com.ym.modulecommon.base.BaseActivity
import com.ym.msdh.R
class SplashActivity : BaseActivity(), SplashContract.View {
......@@ -102,7 +103,8 @@ class SplashActivity : BaseActivity(), SplashContract.View {
val token =com.ym.modulecommon.utils.SettingPreference.getToken()
if (token.isEmpty()){
EventUtils.onEvent("login_token_null", "未登录")
startActivity(Intent(this@SplashActivity, WxLoginActivity::class.java))
// startActivity(Intent(this@SplashActivity, WxLoginActivity::class.java))
startActivity(Intent(this@SplashActivity, GameActivity::class.java))
finish()
}else{
EventUtils.onEvent("login_token_not_null", "已登录")
......
app/src/main/java/com/ym/game/activity/WelfareActivity.kt → app/src/main/java/com/ym/msdh/game/activity/WelfareActivity.kt
View file @ 491070d2
package com.ym.game.activity
package com.ym.msdh.game.activity
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -7,18 +7,19 @@ import android.content.DialogInterface
import android.view.View
import android.view.animation.AnimationUtils
import androidx.recyclerview.widget.LinearLayoutManager
import com.ym.ddcy.R
import com.ym.game.adapter.WelfareDiamondAdapter
import com.ym.game.adapter.WelfareTaskAdpater
import com.ym.game.contract.WelfareContract
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.presenter.WelfarePresenter
import com.ym.game.view.MainDialog
import com.ym.msdh.game.adapter.WelfareDiamondAdapter
import com.ym.msdh.game.adapter.WelfareTaskAdpater
import com.ym.msdh.game.contract.WelfareContract
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.presenter.WelfarePresenter
import com.ym.msdh.game.view.MainDialog
import com.ym.library.listener.IAdVideoListener
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.*
import com.ym.library.net.BaseActivity
import com.ym.library.utils.*
import com.ym.msdh.R
import kotlinx.android.synthetic.main.activity_welfare.*
class WelfareActivity : BaseActivity(), WelfareContract.View,
......@@ -109,7 +110,7 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
EventUtils.onEvent("welfare_task_undone_click_${data.sid}")
if (data.opentype == NewsEntity.AD_TYPE_SDK) {
if (data.sid != null) {
showAd(data.sid)
showAd(data.sid!!)
EventUtils.onEvent("welfare_task_undone_click_total")
}
} else {
......@@ -124,7 +125,9 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
EventUtils.onEvent("welfare_task_done_click_total")
}
EventUtils.onEvent("welfare_task_done_click_${data.sid}")
mPresenter?.getTaskReceiveList(data?.sid)
if (data.sid != null) {
mPresenter?.getTaskReceiveList(data?.sid!!)
}
}
}
view?.postDelayed({
......
app/src/main/java/com/ym/game/activity/WxLoginActivity.kt → app/src/main/java/com/ym/msdh/game/activity/WxLoginActivity.kt
View file @ 491070d2
package com.ym.game.activity
package com.ym.msdh.game.activity
import android.content.Intent
import android.util.Log
import android.view.View
import android.widget.Toast
import com.umeng.analytics.MobclickAgent
import com.ym.game.GameActivity
import com.ym.library.Constant
import com.ym.library.module.ReportEntity
import com.ym.msdh.game.GameActivity
import com.ym.library.net.*
import com.ym.library.utils.*
import com.ym.library.utils.EventUtils.onEvent
import com.ym.library.wechat.UserApiClient
import com.ym.ddcy.R
import com.ym.msdh.R
import kotlinx.android.synthetic.main.activity_wx_login.*
import org.jetbrains.anko.act
......
app/src/main/java/com/ym/game/adapter/CardLayoutManager.java → app/src/main/java/com/ym/msdh/game/adapter/CardLayoutManager.java
View file @ 491070d2
package com.ym.game.adapter;
package com.ym.msdh.game.adapter;
import android.content.Context;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.ym.library.utils.Utils;
public class CardLayoutManager extends RecyclerView.LayoutManager {
......
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/CashExchangeAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
......@@ -14,9 +14,9 @@ import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.library.module.WithDrawEntity2
import com.ym.game.view.MainDialog
import com.ym.msdh.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.ExchangeEntity
import com.ym.library.net.BaseObserver
......@@ -28,6 +28,7 @@ import com.ym.library.utils.EventUtils
import com.ym.library.utils.Utils
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.base.NoDoubleClickListener
import com.ym.msdh.R
class CashExchangeAdapter :
BaseRecyclerAdapter<WithDrawEntity2.WdList, CashExchangeAdapter.ViewHolder> {
......
app/src/main/java/com/ym/game/adapter/ClockInWithdrawAdpater.kt → app/src/main/java/com/ym/msdh/game/adapter/ClockInWithdrawAdpater.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -12,10 +12,9 @@ import android.widget.*
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.ddcy.R
import com.ym.library.Constant
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.utils.Utils
import com.ym.msdh.R
/**
*Craeted by ${junqi.li}
......@@ -69,7 +68,7 @@ class ClockInWithdrawAdpater :
//普通任务
holder?.tvDayNum?.setTextColor(Color.parseColor("#ED7624"))
holder?.tvAdNum.text =
Html.fromHtml("<font color=\"#8C856F\"><small>${data?.firstDesc} </small><</font>${data?.middleDesc}<font color=\"#8C856F\"><small> ${data?.endDesc}</small></font>")
Html.fromHtml("<font color=\"#8C856F\"><small>${data?.firstDesc} </small></font>${data?.middleDesc}<font color=\"#8C856F\"><small> ${data?.endDesc}</small></font>")
holder?.tvMoney?.visibility = View.GONE
......
app/src/main/java/com/ym/game/adapter/PuzzleBottomAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/PuzzleBottomAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.PuzzleEntity
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.base.BaseRecyclerAdapter
import com.ym.msdh.R
class PuzzleBottomAdapter : BaseRecyclerAdapter<PuzzleEntity.PuzzleData, RecyclerView.ViewHolder> {
......
app/src/main/java/com/ym/game/adapter/PuzzleTopAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/PuzzleTopAdapter.kt
View file @ 491070d2
......@@ -5,10 +5,11 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.library.module.PuzzleEntity
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.base.BaseRecyclerAdapter
import com.ym.msdh.R
class PuzzleTopAdapter:
......
app/src/main/java/com/ym/game/adapter/RecordAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/RecordAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.content.Context
import android.view.LayoutInflater
......@@ -6,10 +6,11 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.modulecommon.AppliContext
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.WdHistoryEntity
import com.ym.msdh.R
class RecordAdapter : BaseRecyclerAdapter<WdHistoryEntity, RecordAdapter.ViewHolder> {
private var mContext: Context? = null
......
app/src/main/java/com/ym/game/adapter/SigninDropsAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/SigninDropsAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
......@@ -9,8 +8,9 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.ddcy.R
import com.ym.library.module.SinginEntity
import com.ym.msdh.R
/**
*Craeted by ${junqi.li}
......
app/src/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/SpeedWaterTaskAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -11,20 +11,18 @@ import android.view.ViewGroup
import android.widget.*
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.game.view.MainDialog
import com.ym.msdh.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.net.BaseObserver
import com.ym.library.net.RxSchedulers
import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.utils.LogUtils
import com.ym.library.utils.Utils
import com.ym.ddcy.R
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskCompleteEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.net.GameApiClient
import com.ym.library.utils.EventUtils
import com.ym.msdh.R
class SpeedWaterTaskAdapter :
BaseRecyclerAdapter<NewsEntity, SpeedWaterTaskAdapter.WateringTaskHolder> {
......
app/src/main/java/com/ym/game/adapter/WareHouseAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/WareHouseAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.content.Context
import android.view.LayoutInflater
......@@ -7,10 +7,11 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.FlyBoxEntity
import com.ym.modulecommon.AppliContext
import com.ym.msdh.R
class WareHouseAdapter : BaseRecyclerAdapter<FlyBoxEntity, WareHouseAdapter.ViewHolder> {
private var mContext: Context? = null
......
app/src/main/java/com/ym/game/adapter/WateringTaskAdpater.kt → app/src/main/java/com/ym/msdh/game/adapter/WateringTaskAdpater.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
import android.app.Activity
import android.text.Html
import android.text.TextUtils
import android.util.Log
import android.view.*
import android.widget.*
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.game.view.MainDialog
import com.ym.msdh.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.net.BaseObserver
import com.ym.library.net.RxSchedulers
......@@ -17,12 +17,12 @@ import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.utils.LogUtils
import com.ym.library.utils.Utils
import com.ym.ddcy.R
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskCompleteEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.net.GameApiClient
import com.ym.library.utils.EventUtils
import com.ym.msdh.R
/**
*Craeted by ${junqi.li}
......@@ -46,7 +46,7 @@ class WateringTaskAdpater :
}
override fun getItemCount(): Int {
return mList.size
return 10
}
override fun onBindViewHolder(holder: WateringTaskHolder, position: Int) {
......@@ -90,7 +90,8 @@ class WateringTaskAdpater :
holder.btnProgess.visibility = View.VISIBLE
holder.btnProgess.max = data.awardLimit!!
holder.btnProgess.setProgress(data.current_nums!!)
holder.tvProgess.text = "${data.current_nums}/${data.awardLimit}"
// holder.tvProgess.text = "${data.current_nums}/${data.awardLimit}"
holder.tvProgess.text = Html.fromHtml("<font color=\"#FC6002\">${data?.current_nums}</font>/${data.awardLimit}")
}
holder.ivStatus.addClickScale()
......@@ -145,7 +146,7 @@ class WateringTaskAdpater :
} else {
layoutParams.setMargins(0, 0, 0, Utils.dip2px(8f))
}
holder.layoutRoot.layoutParams = layoutParams
holder.rlbg.layoutParams = layoutParams
}
}
......@@ -165,9 +166,8 @@ class WateringTaskAdpater :
val ivStatus: ImageView = itemView.findViewById(R.id.tv_watering_item_status)
val imgcoin: ImageView = itemView.findViewById(R.id.img_icon_item)
val layoutRoot: LinearLayout = itemView.findViewById(R.id.layout_watering_root)
val rlbg: RelativeLayout = itemView.findViewById(R.id.ll_one)
val imglucky: ImageView = itemView.findViewById(R.id.id_img_lucy)
val imglucky: TextView = itemView.findViewById(R.id.id_img_lucy)
}
......
app/src/main/java/com/ym/game/adapter/WelfareDiamondAdapter.kt → app/src/main/java/com/ym/msdh/game/adapter/WelfareDiamondAdapter.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -8,12 +8,12 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.DiamondEntity
import com.ym.library.module.NewsEntity
import com.ym.library.utils.Utils
import com.ym.msdh.R
/**
*Craeted by ${junqi.li}
......
app/src/main/java/com/ym/game/adapter/WelfareTaskAdpater.kt → app/src/main/java/com/ym/msdh/game/adapter/WelfareTaskAdpater.kt
View file @ 491070d2
package com.ym.game.adapter
package com.ym.msdh.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
import android.app.Activity
import android.text.TextUtils
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
......@@ -14,8 +12,9 @@ import com.bumptech.glide.Glide
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.utils.Utils
import com.ym.ddcy.R
import com.ym.library.module.NewsEntity
import com.ym.msdh.R
/**
*Craeted by ${junqi.li}
......
app/src/main/java/com/ym/game/application/BaseApplication.kt → app/src/main/java/com/ym/msdh/game/application/BaseApplication.kt
View file @ 491070d2
package com.ym.game.application;
package com.ym.msdh.game.application;
import android.app.Activity
......@@ -12,7 +12,6 @@ import android.os.Process
import android.text.TextUtils
import android.util.Log
import androidx.multidex.MultiDex
import androidx.multidex.MultiDexApplication
import com.bx.adsdk.AdSdk
import com.tencent.bugly.crashreport.CrashReport
import com.umeng.commonsdk.UMConfigure
......@@ -53,16 +52,14 @@ class BaseApplication : BaseApplication() {
private var backToFrontTime: Long = 0
override fun onCreate() {
super.onCreate()
NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
// NetConfig.BASE_FEED_URL="https://fsapi.ihuomao.com/"
// NetConfig.BASE_AD_URL="https://bs.ihuomao.com/"
// NetConfig.URL_REPORT_BASE="http://report.ihuomao.com/"
//TODO 上线去掉测试地址
// NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
// Constant.appLs = "afcbef40e31631d3"//appls
NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
AdManager.init(this,"afcbef40e31631d3")
LogUtils.getConfig().logSwitch = true
UMConfigure.setLogEnabled(true)
......
app/src/main/java/com/ym/game/contract/CashExchangeContract.kt → app/src/main/java/com/ym/msdh/game/contract/CashExchangeContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.WithDrawEntity2
......
app/src/main/java/com/ym/game/contract/ClockInWithdrawContract.kt → app/src/main/java/com/ym/msdh/game/contract/ClockInWithdrawContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.module.ExchangeEntity
......
app/src/main/java/com/ym/game/contract/PuzzleContract.kt → app/src/main/java/com/ym/msdh/game/contract/PuzzleContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.PuzzleEntity
......
app/src/main/java/com/ym/game/contract/RecordContract.kt → app/src/main/java/com/ym/msdh/game/contract/RecordContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.WdHistoryEntity
......
app/src/main/java/com/ym/game/contract/SpeedWaterContract.kt → app/src/main/java/com/ym/msdh/game/contract/SpeedWaterContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.TaskListEntity
import com.ym.library.module.WateringTaskEntity
......
app/src/main/java/com/ym/game/contract/TurntableContract.kt → app/src/main/java/com/ym/msdh/game/contract/TurntableContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.TurntableEntity
......
app/src/main/java/com/ym/game/contract/WareHouseContract.kt → app/src/main/java/com/ym/msdh/game/contract/WareHouseContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.WateringTaskEntity
class WareHouseContract {
......
app/src/main/java/com/ym/game/contract/WateringRewardContract.kt → app/src/main/java/com/ym/msdh/game/contract/WateringRewardContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.SinginEntity
import com.ym.library.module.TaskListEntity
......
app/src/main/java/com/ym/game/contract/WelfareContract.kt → app/src/main/java/com/ym/msdh/game/contract/WelfareContract.kt
View file @ 491070d2
package com.ym.game.contract
package com.ym.msdh.game.contract
import com.ym.library.module.*
......
app/src/main/java/com/ym/game/netstate/NetStateChangeReceiver.java → app/src/main/java/com/ym/msdh/game/netstate/NetStateChangeReceiver.java
View file @ 491070d2
package com.ym.game.netstate;
package com.ym.msdh.game.netstate;
import android.content.BroadcastReceiver;
import android.content.Context;
......
app/src/main/java/com/ym/game/netstate/NetworkType.java → app/src/main/java/com/ym/msdh/game/netstate/NetworkType.java
View file @ 491070d2
package com.ym.game.netstate;
package com.ym.msdh.game.netstate;
/**
* @author (wangXuewei)
......
app/src/main/java/com/ym/game/netstate/NetworkUtil.java → app/src/main/java/com/ym/msdh/game/netstate/NetworkUtil.java
View file @ 491070d2
package com.ym.game.netstate;
package com.ym.msdh.game.netstate;
import android.content.Context;
import android.net.ConnectivityManager;
......
app/src/main/java/com/ym/game/notif/NotificationService.java → app/src/main/java/com/ym/msdh/game/notif/NotificationService.java
View file @ 491070d2
package com.ym.game.notif;
package com.ym.msdh.game.notif;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
......@@ -18,8 +17,9 @@ import android.widget.RemoteViews;
import androidx.core.app.NotificationCompat;
import com.ym.ddcy.R;
import com.ym.game.GameActivity;
;
import com.ym.msdh.R;
import com.ym.msdh.game.GameActivity;
import com.ym.library.utils.LogUtils;
import java.lang.reflect.Method;
......
app/src/main/java/com/ym/game/presenter/CashExchangePresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/CashExchangePresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.ym.game.contract.CashExchangeContract
import com.ym.msdh.game.contract.CashExchangeContract
import com.ym.library.module.WithDrawEntity2
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
......
app/src/main/java/com/ym/game/presenter/ClockInWithdrawPresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/ClockInWithdrawPresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import android.app.Activity
import com.ym.game.contract.ClockInWithdrawContract
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.view.MainDialog
import com.ym.msdh.game.contract.ClockInWithdrawContract
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.view.MainDialog
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.module.ExchangeEntity
import com.ym.library.module.FlyBoxEntity
......
app/src/main/java/com/ym/game/presenter/PuzzlePresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/PuzzlePresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import android.app.Activity
import android.util.Log
import android.view.View
import com.ym.game.contract.PuzzleContract
import com.ym.msdh.game.contract.PuzzleContract
import com.ym.library.module.PuzzleEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
......
app/src/main/java/com/ym/game/presenter/RecordPresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/RecordPresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.ym.game.contract.RecordContract
import com.ym.msdh.game.contract.RecordContract
import com.ym.library.module.WdHistoryEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
......
app/src/main/java/com/ym/game/presenter/SpeedWaterPresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/SpeedWaterPresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.ym.game.contract.SpeedWaterContract
import com.ym.msdh.game.contract.SpeedWaterContract
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskListEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
......
app/src/main/java/com/ym/game/presenter/TurntablePresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/TurntablePresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.ym.game.contract.TurntableContract
import com.ym.msdh.game.contract.TurntableContract
import com.ym.library.module.TurntableEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
......
app/src/main/java/com/ym/game/presenter/WareHousePresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/WareHousePresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.ym.game.contract.WareHouseContract
import com.ym.msdh.game.contract.WareHouseContract
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
......
app/src/main/java/com/ym/game/presenter/WateringRewardPresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/WateringRewardPresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.ym.game.contract.WateringRewardContract
import com.ym.msdh.game.contract.WateringRewardContract
import com.ym.library.module.NewsEntity
import com.ym.library.module.SinginEntity
import com.ym.library.module.TaskListEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
......
app/src/main/java/com/ym/game/presenter/WelfarePresenter.kt → app/src/main/java/com/ym/msdh/game/presenter/WelfarePresenter.kt
View file @ 491070d2
package com.ym.game.presenter
package com.ym.msdh.game.presenter
import com.tencent.ep.commonbase.api.AppContext
import com.ym.game.contract.WelfareContract
import com.ym.msdh.game.contract.WelfareContract
import com.ym.library.module.*
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
import com.ym.library.utils.Utils
class WelfarePresenter : WelfareContract.Presenter {
......
app/src/main/java/com/ym/game/utils/CenterDialog.kt → app/src/main/java/com/ym/msdh/game/utils/CenterDialog.kt
View file @ 491070d2
package com.ym.game.utils
package com.ym.msdh.game.utils
import android.app.Activity
import android.app.Dialog
......@@ -11,11 +11,11 @@ import android.text.style.ForegroundColorSpan
import android.view.Gravity
import android.view.View
import android.widget.TextView
import com.ym.ddcy.R
import com.ym.library.base.BaseDialog
import com.ym.library.net.NetConfig
import com.ym.library.utils.JumpUtils
import org.jetbrains.anko.act
import com.ym.msdh.R
/**
* Created by gaoleichao on 2018/8/17.
......@@ -73,7 +73,7 @@ object CenterDialog:BaseDialog() {
desc.setMovementMethod(LinkMovementMethod.getInstance());
val str = "欢迎使用多多菜园！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
val str = "欢迎使用美食大亨！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
val ss = SpannableStringBuilder("查看完整《用户协议》和《隐私政策》，请您在使用前仔细阅读并了解。")
ss.setSpan(
......@@ -106,6 +106,8 @@ object CenterDialog:BaseDialog() {
disagreelistener?.onClick(it)
}
mDialog.setCanceledOnTouchOutside(false)
mDialog.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/view/CashExchangeDialog.kt → app/src/main/java/com/ym/msdh/game/view/CashExchangeDialog.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.widget.ImageView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.game.adapter.CashExchangeAdapter
import com.ym.game.contract.CashExchangeContract
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.adapter.CashExchangeAdapter
import com.ym.msdh.game.contract.CashExchangeContract
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.library.module.WithDrawEntity2
import com.ym.game.presenter.CashExchangePresenter
import com.ym.msdh.game.presenter.CashExchangePresenter
import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.rxbus.Subscribe
import com.ym.library.rxbus.ThreadMode
import com.ym.ddcy.R
import com.ym.library.utils.EventUtils
import com.ym.msdh.R
object CashExchangeDialog : CashExchangeContract.View {
......@@ -27,7 +29,7 @@ object CashExchangeDialog : CashExchangeContract.View {
private var cashExchangeAdapter: CashExchangeAdapter? = null
//展示兑换窗口
fun showCashExchage(context: Context?, mListener: IDialogViewCloseCallback) {
fun showCashExchage(context: Activity?, mListener: IDialogViewCloseCallback) {
if (context == null) {
return
}
......@@ -67,7 +69,9 @@ object CashExchangeDialog : CashExchangeContract.View {
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
......
app/src/main/java/com/ym/game/view/ExchangeRecordDialog.kt → app/src/main/java/com/ym/msdh/game/view/ExchangeRecordDialog.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.widget.ImageView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.game.adapter.RecordAdapter
import com.ym.game.contract.RecordContract
import com.ym.game.presenter.RecordPresenter
import com.ym.msdh.game.adapter.RecordAdapter
import com.ym.msdh.game.contract.RecordContract
import com.ym.msdh.game.presenter.RecordPresenter
import com.ym.library.module.WdHistoryEntity
import com.ym.library.rxbus.RxBusUtil
import com.ym.msdh.R
//兑换记录弹窗
object ExchangeRecordDialog : RecordContract.View {
......@@ -22,7 +24,7 @@ object ExchangeRecordDialog : RecordContract.View {
private var adapter: RecordAdapter? = null
//展示兑换记录窗口
fun showRecord(context: Context?) {
fun showRecord(context: Activity?) {
if (context == null) {
return
}
......@@ -55,7 +57,9 @@ object ExchangeRecordDialog : RecordContract.View {
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
......
app/src/main/java/com/ym/game/view/MainDialog.kt → app/src/main/java/com/ym/msdh/game/view/MainDialog.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
import android.os.Debug
import android.util.Log
import android.view.Gravity
import android.view.MotionEvent
......@@ -13,15 +12,13 @@ import android.view.ViewGroup
import android.widget.*
import com.bytedance.sdk.openadsdk.TTNativeExpressAd
import com.qq.e.ads.nativ.NativeExpressADView
import com.ym.admodule.config.AdManager
import com.ym.admodule.config.ZXADSizeConfig
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.modulecommon.AppliContext
import com.ym.ddcy.R
import com.ym.library.Constant
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.TurntableEntity
import com.ym.library.utils.*
import com.ym.msdh.R
object MainDialog {
......@@ -51,8 +48,8 @@ object MainDialog {
}
window?.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
window?.attributes = lp
if (animation > 0)
window?.setWindowAnimations(animation)//设置动画
if (animation == 0)
window?.setWindowAnimations(com.ym.library.R.style.UpdateVersionCompatDialogTheme)//设置动画
return mDialogView
}
......@@ -97,7 +94,9 @@ object MainDialog {
}
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
/**
......@@ -198,7 +197,9 @@ object MainDialog {
})
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
fun setImage(img: ImageView, id: Int) {
......@@ -342,7 +343,9 @@ object MainDialog {
})
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
//福利中心开宝箱
......@@ -416,7 +419,9 @@ object MainDialog {
})
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
//提现弹窗
......@@ -530,7 +535,9 @@ object MainDialog {
}
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!(context as Activity)?.isFinishing) {
mDialog?.show()
}
}
fun showActivityDesc(activity: Activity) {
......@@ -548,7 +555,9 @@ object MainDialog {
}
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
// 获取碎片红包时的弹窗
......@@ -581,7 +590,9 @@ object MainDialog {
}
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
// 云朵加速的弹窗
fun showDialogCloud(
......@@ -622,7 +633,9 @@ object MainDialog {
})
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
/**
* 添加点击缩放效果
......
app/src/main/java/com/ym/game/view/PuzzleDialog.kt → app/src/main/java/com/ym/msdh/game/view/PuzzleDialog.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.animation.Animator
......@@ -23,28 +23,20 @@ import android.widget.RelativeLayout
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.airbnb.lottie.LottieAnimationView
import com.google.gson.annotations.Until
import com.ym.admodule.config.AdManager
import com.ym.admodule.listener.ZXADVideoListener
import com.ym.ddcy.R
import com.ym.game.contract.PuzzleContract
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.presenter.PuzzlePresenter
import com.ym.game.utils.CenterDialog
import com.ym.msdh.game.contract.PuzzleContract
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.presenter.PuzzlePresenter
import com.ym.msdh.game.utils.CenterDialog
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.PuzzleEntity
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.utils.Utils
import com.ym.modulecommon.AppliContext
import com.ym.game.adapter.PuzzleBottomAdapter
import com.ym.library.Constant
import com.ym.msdh.game.adapter.PuzzleBottomAdapter
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.StatusEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
import com.ym.library.utils.AdUtils
import com.ym.library.utils.EventUtils
import com.ym.msdh.R
import com.ym.piggybank.adapter.PuzzleTopAdapter
object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEntity.PuzzleData> {
......@@ -65,7 +57,7 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
var anim_mask_layout: ViewGroup? = null
//展示拼图窗口
fun showPuzzleDialog(context: Context?,mListener: IDialogViewCloseCallback) {
fun showPuzzleDialog(context: Activity?,mListener: IDialogViewCloseCallback) {
if (context == null) {
return
}
......@@ -118,7 +110,9 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
......
app/src/main/java/com/ym/game/view/SpeedWaterPopupWindow.kt → app/src/main/java/com/ym/msdh/game/view/SpeedWaterPopupWindow.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.annotation.SuppressLint
import android.app.Activity
import android.graphics.drawable.ColorDrawable
import android.util.Log
import android.view.*
import android.widget.ImageView
import android.widget.PopupWindow
import android.widget.RelativeLayout
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.admodule.config.AdManager
import com.ym.admodule.listener.ZXADVideoListener
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.game.adapter.SpeedWaterTaskAdapter
import com.ym.game.contract.SpeedWaterContract
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.presenter.SpeedWaterPresenter
import com.ym.library.Constant
import com.ym.msdh.game.adapter.SpeedWaterTaskAdapter
import com.ym.msdh.game.contract.SpeedWaterContract
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.presenter.SpeedWaterPresenter
import com.ym.library.module.NewsEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.RxSchedulers
import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.rxbus.Subscribe
import com.ym.library.rxbus.ThreadMode
import com.ym.ddcy.R
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.TaskListEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.net.GameApiClient
import com.ym.library.utils.*
import com.ym.msdh.R
class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
OnRecycleItemClickListener<NewsEntity> {
......@@ -82,10 +75,10 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
// 跳转页面 1转盘 2高额水滴任务 3首页 4激励视频 直客任务链接"
// if()
// appmodel_id
// 应用类模块跳转 跳转到多多菜园首页 65
//应用类模块跳转到多多菜园转盘抽奖 63
//应用类模块跳转到多多菜园开宝箱 64
//应用类模块跳转到多多菜园福利中心 66
// 应用类模块跳转 跳转到美食大亨首页 65
//应用类模块跳转到美食大亨转盘抽奖 63
//应用类模块跳转到美食大亨开宝箱 64
//应用类模块跳转到美食大亨福利中心 66
if (data.opentype == 7) {
if (data.appmodel_id == 65) {
dismiss()
......@@ -101,7 +94,7 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
} else if (data.opentype == 1) {
if (data.sid != null) {
// EventUtils.onEvent("welfare_task_undone_click", "${data.sid}")
showAd(data.sid)
showAd(data.sid!!)
EventUtils.onEvent("jiasu_undone_click_total")
}
else {
......
app/src/main/java/com/ym/game/view/TurntableDialog.kt → app/src/main/java/com/ym/msdh/game/view/TurntableDialog.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.os.CountDownTimer
import android.util.Log
import android.view.Gravity
......@@ -13,21 +12,20 @@ import android.widget.ImageView
import android.widget.TextView
import com.ym.admodule.config.AdManager
import com.ym.admodule.listener.ZXADVideoListener
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.contract.TurntableContract
import com.ym.game.presenter.TurntablePresenter
import com.ym.msdh.game.listener.IDialogViewCloseCallback
import com.ym.msdh.game.contract.TurntableContract
import com.ym.msdh.game.presenter.TurntablePresenter
import com.ym.library.net.BaseObserver
import com.ym.library.net.RxSchedulers
import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.rxbus.Subscribe
import com.ym.library.rxbus.ThreadMode
import com.ym.ddcy.R
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.StatusEntity
import com.ym.library.module.TurntableEntity
import com.ym.library.net.GameApiClient
import com.ym.library.utils.*
import com.ym.msdh.R
/**
......@@ -90,7 +88,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
btnTurntableLottery?.addClickScale()
btnTurntableLottery?.setOnClickListener {
if (Utils.isFastClick2()) {
if (turntables?.showVideo == 0 && turntables?.countDownSecond!! <=0) {
if (turntables?.showVideo == 0 && turntables?.countDownSecond!! <= 0) {
//开启转盘
EventUtils.onEvent("click_lucky_turntable_lottery", "幸运转盘抽奖")
btnTurntableLottery?.isEnabled = false
......@@ -124,7 +122,9 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
private fun showAd() {
......@@ -197,7 +197,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
fun initView(data: TurntableEntity) {
tvTurntableCount?.text = "剩余次数: ${data.lotteryNum}"
//免费抽奖
if (data.showVideo == 0 && data.countDownSecond != null && data.countDownSecond!! <=0) {
if (data.showVideo == 0 && data.countDownSecond != null && data.countDownSecond!! <= 0) {
tvTime?.visibility = View.GONE
btnCountdown?.visibility = View.GONE
btnTurntableLottery?.visibility = View.VISIBLE
......@@ -313,6 +313,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
this.onTouchEvent(event)
}
}
//看视频领上报
fun getVideoAcceleratorsReceive3() {
GameApiClient.gameApi.adVideoReport()
......
app/src/main/java/com/ym/game/view/TurntableUtils.kt → app/src/main/java/com/ym/msdh/game/view/TurntableUtils.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.animation.Animator
import android.animation.AnimatorSet
......@@ -6,7 +6,7 @@ import android.animation.ObjectAnimator
import android.util.Log
import android.view.animation.AccelerateDecelerateInterpolator
import android.widget.ImageView
import com.ym.game.listener.CustomAnimatiorListener
import com.ym.msdh.game.listener.CustomAnimatiorListener
import com.ym.library.utils.LogUtils
/**
......
app/src/main/java/com/ym/game/view/WareHouseDialog.kt → app/src/main/java/com/ym/msdh/game/view/WareHouseDialog.kt
View file @ 491070d2
package com.ym.game.view
package com.ym.msdh.game.view
import android.app.Activity
import android.app.Dialog
import android.content.Context
import android.view.Gravity
import android.widget.ImageView
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.ddcy.R
import com.ym.game.adapter.RecordAdapter
import com.ym.game.adapter.WareHouseAdapter
import com.ym.game.contract.WareHouseContract
import com.ym.game.presenter.RecordPresenter
import com.ym.game.presenter.WareHousePresenter
import com.ym.msdh.game.adapter.WareHouseAdapter
import com.ym.msdh.game.contract.WareHouseContract
import com.ym.msdh.game.presenter.WareHousePresenter
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.rxbus.RxBusUtil
import com.ym.library.utils.EventUtils
import com.ym.library.utils.LogUtils
import com.ym.msdh.R
object WareHouseDialog : WareHouseContract.View {
......@@ -27,7 +24,7 @@ object WareHouseDialog : WareHouseContract.View {
private var adapter: WareHouseAdapter? = null
//展示兑换记录窗口
fun showWareHouse(context: Context?) {
fun showWareHouse(context: Activity?) {
if (context == null) {
return
}
......@@ -61,7 +58,9 @@ object WareHouseDialog : WareHouseContract.View {
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
......
app/src/main/java/com/ym/ddcy/wxapi/WXEntryActivity.java → app/src/main/java/com/ym/msdh/wxapi/WXEntryActivity.java
View file @ 491070d2
package com.ym.ddcy.wxapi;
package com.ym.msdh.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
......
app/src/main/res/drawable/btn_selector.xml deleted 100644 → 0
View file @ d29605c5
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/icon_shouxia_bg" android:state_pressed="false"/>
<item android:drawable="@mipmap/icon_press" android:state_pressed="true"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_ffffff_r10.xml
View file @ 491070d2
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#69ffffff"/>
<corners android:radius="10.5dp"/>
<solid android:color="#FBFFE6"/>
<corners android:radius="11dp"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_clock_in_withdraw.xml
View file @ 491070d2
......@@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F7BD7C"
android:background="#FDAB2D"
android:orientation="vertical">
<RelativeLayout
android:gravity="center_vertical"
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginTop="33dp">
android:layout_marginTop="33dp"
android:gravity="center_vertical">
<ImageView
android:id="@+id/iv_clock_in_close"
......@@ -20,11 +20,11 @@
android:paddingRight="12dp"
android:src="@drawable/icon_clock_in_close" />
<com.ym.game.wedget.MediumBoldTextView
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="打卡提现"
android:src="@drawable/icon_clock_in_title"
android:textColor="#7E320A"
android:textSize="20sp"
android:textStyle="bold" />
......@@ -38,16 +38,22 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginTop="4dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/icon_withdrawals_record_bg"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:id="@+id/tv_clock_in_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="19dp"
android:includeFontPadding="false"
android:textColor="#ED7624"
android:textSize="26sp"
android:textColor="#663408"
android:textSize="24sp"
android:textStyle="bold"
tools:text="已连续打卡 天" />
......@@ -57,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:includeFontPadding="false"
android:textColor="#8F2C0F"
android:textColor="#9E6006"
android:textSize="16sp"
tools:text="每日观看20个视频即可完成打卡" />
......
app/src/main/res/layout/activity_welfare.xml
View file @ 491070d2
......@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F7BD7C"
tools:context="com.ym.game.activity.WelfareActivity">
tools:context=".game.activity.WelfareActivity">
<RelativeLayout
android:id="@+id/layout_welfare_title"
......@@ -23,7 +23,7 @@
android:paddingBottom="12dp"
android:src="@drawable/arrow_left" />
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
......@@ -88,7 +88,7 @@
android:layout_toRightOf="@+id/iv_welfare_diamond_big"
android:orientation="vertical">
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_welfare_diamond_conut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/dialog_privacy_protocol_view.xml
View file @ 491070d2
......@@ -39,7 +39,7 @@
android:layout_marginLeft="16dp"
android:layout_marginTop="20dp"
android:layout_marginRight="16dp"
android:text="我们依据最新法律，向您说明多多菜园\n软件的隐私政策，特向您推送本提示，\n请您阅读并充分理解相关条款。"
android:text="我们依据最新法律，向您说明美食大亨\n软件的隐私政策，特向您推送本提示，\n请您阅读并充分理解相关条款。"
android:textColor="#666666"
android:textSize="15sp" />
......
app/src/main/res/layout/item_clock_in_tip.xml
View file @ 491070d2
......@@ -5,7 +5,7 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp">
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_ffffff_r10"
......
app/src/main/res/layout/item_clock_in_withdraw.xml
View file @ 491070d2
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginLeft="10dp"
android:layout_marginBottom="5dp">
<RelativeLayout
......@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginRight="@dimen/dp_20">
android:layout_marginRight="@dimen/dp_10">
<ImageView
android:id="@+id/iv_clock_in_item_bg"
......@@ -47,7 +47,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_ad_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -56,9 +56,9 @@
android:includeFontPadding="false"
android:text="17"
android:textColor="#E91119"
android:textSize="18sp" />
android:textSize="20sp" />
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -86,7 +86,7 @@
android:progress="30"
android:progressDrawable="@drawable/game_clock_in_item_progress_bg" />
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -105,7 +105,7 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_marginRight="10dp"
android:src="@drawable/icon_clock_in_item_red_pg"
android:visibility="visible" />
......@@ -116,7 +116,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="10dp"
android:visibility="visible">
<ImageView
......@@ -126,7 +125,7 @@
android:layout_marginTop="-8dp"
android:src="@drawable/icon_clock_in_item_red_pg_coin_complete" />
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_money_red"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -143,10 +142,10 @@
android:layout_height="wrap_content"
android:layout_below="@+id/layout_clock_in_item_root"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:layout_marginRight="10dp"
android:visibility="visible">
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
......@@ -155,7 +154,7 @@
android:gravity="center"
android:includeFontPadding="false"
android:text="完成当前打卡，可解锁下一天打卡任务"
android:textColor="#8F2C0F"
android:textColor="#9E6006"
android:textSize="12sp" />
</FrameLayout>
......
app/src/main/res/layout/item_watering_task.xml
View file @ 491070d2
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layout_watering_root"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll_one"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="92dp"
android:background="@drawable/icon_luck_task">
<TextView
android:id="@+id/id_img_lucy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="17dp"
android:layout_marginTop="6dp"
android:includeFontPadding="false"
android:text="幸运任务"
android:textColor="#FAFFE6"
android:textSize="12sp" />
<RelativeLayout
android:id="@+id/ll_one"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/icon_luck_task"
android:layout_centerVertical="true"
android:layout_marginLeft="25dp"
android:orientation="vertical">
<ImageView
android:id="@+id/id_img_lucy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_lucky"
android:layout_marginTop="@dimen/dp_3"
android:layout_marginLeft="@dimen/dp_2"/>
<TextView
android:id="@+id/tv_watering_item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_22"
android:includeFontPadding="false"
android:text="浇水10次"
android:textColor="#642D2D"
android:textSize="@dimen/sp_16"
android:textColor="#722E01"
android:textSize="17sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/layout_watering_progress"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_28"
android:layout_below="@+id/tv_watering_item_title"
android:layout_marginLeft="@dimen/dp_13"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center">
<!-- <com.ym.module.guesssong.widget.ProgressButton
android:id="@+id/progess_watering_item"
style="?android:attr/borderlessButtonStyle"
android:layout_width="150dp"
android:layout_height="14dp"
android:layout_below="@+id/tv_watering_item_title"
android:progressDrawable="@drawable/user_progressbar_bg"
app:cornerRadius="8dp" />-->
<ProgressBar
android:id="@+id/progess_watering_item"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="150dp"
android:layout_height="10dp"
android:layout_marginRight="12dp"
android:layout_marginRight="6dp"
android:progressDrawable="@drawable/user_progressbar_bg" />
<TextView
......@@ -62,34 +53,40 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="221"
android:textColor="#8F6E42"
android:textSize="13sp" />
android:text="0/10"
android:textColor="#722E01"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="25dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<LinearLayout
android:id="@+id/id_ll_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_8"
android:gravity="right"
android:layout_marginRight="@dimen/dp_8"
>
android:layout_height="wrap_content">
<ImageView
android:id="@+id/img_icon_item"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22"
android:layout_marginRight="@dimen/dp_3"
android:src="@mipmap/icon_coin"/>
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_watering_item_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="+40"
android:text="+0"
android:textColor="#ED5430"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
......@@ -99,12 +96,8 @@
android:id="@+id/tv_watering_item_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_right"
android:layout_alignParentRight="true"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginRight="@dimen/dp_13"
android:layout_marginBottom="@dimen/dp_9"
android:src="@mipmap/icon_mian_popup_complete"
/>
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
android:src="@mipmap/icon_mian_popup_complete" />
</LinearLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/item_welfare_task.xml
View file @ 491070d2
......@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical">
<com.ym.game.wedget.MediumBoldTextView
<com.ym.library.widget.MediumBoldTextView
android:id="@+id/tv_welfare_item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/values/strings.xml
View file @ 491070d2
<resources>
<string name="app_name">多多菜园</string>
<string name="app_name">美食大亨</string>
</resources>
app/version.properties
View file @ 491070d2
PACKAGE_NAME=com.ym.ddcy
VERSION_CODE=8
VERSION_NAME=1.0.7
\ No newline at end of file
PACKAGE_NAME=com.ym.msdh
VERSION_CODE=1
VERSION_NAME=1.0.0
\ No newline at end of file
library/src/main/AndroidManifest.xml
View file @ 491070d2
......@@ -85,7 +85,7 @@
<data
android:host="web"
android:scheme="ddcy" />
android:scheme="msdh" />
</intent-filter>
</activity>
......@@ -100,7 +100,7 @@
<data
android:host="ad_web"
android:scheme="ddcy" />
android:scheme="msdh" />
</intent-filter>
</activity>
......@@ -115,7 +115,7 @@
<data
android:host="new_web"
android:scheme="ddcy" />
android:scheme="msdh" />
</intent-filter>
</activity>
......@@ -130,7 +130,7 @@
<data
android:host="xiaoman"
android:scheme="ddcy" />
android:scheme="msdh" />
</intent-filter>
</activity>
......
library/src/main/java/com/ym/library/Constant.java
View file @ 491070d2
......@@ -15,7 +15,7 @@ import java.util.List;
public class Constant {
public static int REQUEST_CODE_ASK_PERMISSIONS = 0x0101;
public static final String scheme = "ddcy";
public static final String scheme = "msdh";
public static final String withdraw_right_top = "withdraw_right_top";
public static final String sign_in_again_video = "sign_in_again_video";
......@@ -370,7 +370,7 @@ public class Constant {
public static class Param {
//public static String mPacketName = PhoneUtils.INSTANCE.getAppPackage();
public static String mPacketName = "com.ym.ddcy";
public static String mPacketName = "com.ym.msdh";
public static String vendor = Build.MANUFACTURER;
public static String svn = Build.VERSION.SDK_INT + "";
public static String androidId = "";
......
library/src/main/java/com/ym/library/activity/JavaInterface.kt
View file @ 491070d2
......@@ -223,6 +223,9 @@ abstract class JavaInterface {
* 打开 APP 的详情设置
*/
private fun openAppDetails() {
if (act != null) {
return
}
var builder = AlertDialog.Builder(act)
builder.setMessage("你还未获取存储权限哦，现在去获取？"); // 取消后可到 “应用信息 -> 权限” 中授予"
builder.setPositiveButton("确定", object : DialogInterface.OnClickListener {
......@@ -238,7 +241,9 @@ abstract class JavaInterface {
}
})
builder.setNegativeButton("取消", null)
builder.show()
if (!act?.isFinishing!!) {
builder.show()
}
}
/**
......
library/src/main/java/com/ym/library/base/BaseDialog.kt
View file @ 491070d2
......@@ -5,6 +5,7 @@ import android.content.Context
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
import com.ym.library.R
import com.ym.library.utils.PhoneUtils
import com.ym.modulecommon.AppliContext
......@@ -13,7 +14,13 @@ import com.ym.modulecommon.AppliContext
*/
open class BaseDialog {
fun showBottomDialog(layout: Int, activity: Context, setHeadDialog: Dialog, animation: Int, gravity: Int): View {
fun showBottomDialog(
layout: Int,
activity: Context,
setHeadDialog: Dialog,
animation: Int,
gravity: Int
): View {
// AlertDialog setHeadDialog = new AlertDialog.Builder(activity).create();
// setHeadDialog.show();
......@@ -39,10 +46,10 @@ open class BaseDialog {
}
//lp.width = (int) (display.getWidth()); // 设置宽度方式二: @过时
//window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,0);
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.MATCH_PARENT)
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)
window.attributes = lp
if (animation > 0)
window.setWindowAnimations(animation)//设置动画
if (animation == 0)
window.setWindowAnimations(R.style.UpdateVersionCompatDialogTheme)//设置动画
return mDialogView
}
......
library/src/main/java/com/ym/library/down/UpdateVersionManager.kt
View file @ 491070d2
......@@ -171,7 +171,9 @@ class UpdateVersionManager : UpdateVersionContract.View, View.OnClickListener {
mDownloadDialog = builder.create()
mDownloadDialog?.setCanceledOnTouchOutside(false)
mDownloadDialog?.setCancelable(false)
mDownloadDialog?.show()
if (!mActivity?.isFinishing) {
mDownloadDialog?.show()
}
}
}
\ No newline at end of file
library/src/main/java/com/ym/library/module/BaseWithdrawEntity.kt 0 → 100644
View file @ 491070d2
package com.ym.library.module
class BaseWithdrawEntity {
var cent:Int? = 0
var wdList:List<WithdrawEntity>? = null
}
\ No newline at end of file
library/src/main/java/com/ym/library/module/LandListEntity.java
View file @ 491070d2
......@@ -37,6 +37,33 @@ public class LandListEntity {
private LandConfigList[] growList;
private int fruitNum;//水果数量
private int acceleratorsNum;//加速剂数量
private int targetVideoNum;//解锁需看视频数量
private int currentVideoNum;//当前已看视频数量
private int stopSecond;//暂停时间点
public int getStopSecond() {
return stopSecond;
}
public void setStopSecond(int stopSecond) {
this.stopSecond = stopSecond;
}
public int getTargetVideoNum() {
return targetVideoNum;
}
public void setTargetVideoNum(int targetVideoNum) {
this.targetVideoNum = targetVideoNum;
}
public int getCurrentVideoNum() {
return currentVideoNum;
}
public void setCurrentVideoNum(int currentVideoNum) {
this.currentVideoNum = currentVideoNum;
}
public LandConfigList[] getGrowList() {
return growList;
......
library/src/main/java/com/ym/library/module/NewLandListEntity.java 0 → 100644
View file @ 491070d2
package com.ym.library.module;
import java.util.List;
/**
* @author (wangXuewei)
* @datetime 2020-12-05 16:34 GMT+8
* @detail :
*/
public class NewLandListEntity {
/**
* landList : [{"id":1,"name":"红玫瑰","unlockPrice":0,"seedPrice":5,"profit":7,"second":0,"countDownSecond":0,"status":3,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":60},{"start":41,"countdown":120},{"start":46,"countdown":300},{"start":51,"countdown":480},{"start":71,"countdown":600},{"start":81,"countdown":960},{"start":91,"countdown":1200},{"start":96,"countdown":1500},{"start":141,"countdown":1800},{"start":146,"countdown":3600},{"start":100000,"countdown":3600}],"fruitNum":15,"acceleratorsNum":0,"targetVideoNum":0,"currentVideoNum":0,"stopSecond":0},{"id":2,"name":"紫玫瑰","unlockPrice":5,"seedPrice":10,"profit":15,"second":0,"countDownSecond":0,"status":3,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":120},{"start":41,"countdown":240},{"start":46,"countdown":480},{"start":51,"countdown":600},{"start":71,"countdown":960},{"start":81,"countdown":1200},{"start":91,"countdown":1500},{"start":96,"countdown":1800},{"start":141,"countdown":2400},{"start":146,"countdown":3600},{"start":100000,"countdown":3600}],"fruitNum":5,"acceleratorsNum":0,"targetVideoNum":0,"currentVideoNum":0,"stopSecond":0},{"id":3,"name":"铃兰","unlockPrice":10,"seedPrice":20,"profit":32,"second":0,"countDownSecond":0,"status":1,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":240},{"start":41,"countdown":360},{"start":46,"countdown":480},{"start":51,"countdown":720},{"start":71,"countdown":1080},{"start":81,"countdown":1500},{"start":91,"countdown":1800},{"start":96,"countdown":2400},{"start":141,"countdown":2700},{"start":146,"countdown":3600},{"start":100000,"countdown":3600}],"fruitNum":4,"acceleratorsNum":0,"targetVideoNum":1,"currentVideoNum":0,"stopSecond":0},{"id":4,"name":"菊花","unlockPrice":50,"seedPrice":30,"profit":52,"second":0,"countDownSecond":0,"status":1,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":480},{"start":41,"countdown":600},{"start":46,"countdown":720},{"start":51,"countdown":960},{"start":71,"countdown":1200},{"start":81,"countdown":1680},{"start":91,"countdown":2160},{"start":96,"countdown":2700},{"start":141,"countdown":3000},{"start":146,"countdown":3600},{"start":100000,"countdown":3600}],"fruitNum":8,"acceleratorsNum":0,"targetVideoNum":1,"currentVideoNum":0,"stopSecond":0},{"id":5,"name":"蝴蝶兰","unlockPrice":100,"seedPrice":50,"profit":90,"second":0,"countDownSecond":0,"status":1,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":720},{"start":41,"countdown":960},{"start":46,"countdown":1200},{"start":51,"countdown":1800},{"start":71,"countdown":2400},{"start":81,"countdown":3000},{"start":91,"countdown":3600},{"start":96,"countdown":4500},{"start":141,"countdown":5400},{"start":146,"countdown":5400},{"start":100000,"countdown":5400}],"fruitNum":2,"acceleratorsNum":0,"targetVideoNum":1,"currentVideoNum":0,"stopSecond":0},{"id":6,"name":"郁金香","unlockPrice":200,"seedPrice":100,"profit":144,"second":0,"countDownSecond":0,"status":3,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":960},{"start":41,"countdown":1200},{"start":46,"countdown":1800},{"start":51,"countdown":2400},{"start":71,"countdown":3000},{"start":81,"countdown":3600},{"start":91,"countdown":4500},{"start":96,"countdown":5400},{"start":141,"countdown":7200},{"start":146,"countdown":7200},{"start":100000,"countdown":7200}],"fruitNum":2,"acceleratorsNum":0,"targetVideoNum":1,"currentVideoNum":0,"stopSecond":0},{"id":7,"name":"风信子","unlockPrice":300,"seedPrice":200,"profit":256,"second":0,"countDownSecond":0,"status":1,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":1200},{"start":41,"countdown":1800},{"start":46,"countdown":2400},{"start":51,"countdown":3000},{"start":71,"countdown":3600},{"start":81,"countdown":4500},{"start":91,"countdown":5400},{"start":96,"countdown":7200},{"start":141,"countdown":9000},{"start":146,"countdown":9000},{"start":100000,"countdown":9000}],"fruitNum":3,"acceleratorsNum":0,"targetVideoNum":1,"currentVideoNum":0,"stopSecond":0},{"id":8,"name":"七色花","unlockPrice":500,"seedPrice":300,"profit":388,"second":0,"countDownSecond":0,"status":1,"seedNum":0,"cloudSecond":10,"acceleratorsSecond":15,"guideStatus":0,"growList":[{"start":31,"countdown":1800},{"start":41,"countdown":2400},{"start":46,"countdown":3000},{"start":51,"countdown":3600},{"start":71,"countdown":4500},{"start":81,"countdown":5400},{"start":91,"countdown":7200},{"start":96,"countdown":9000},{"start":141,"countdown":10800},{"start":146,"countdown":10800},{"start":100000,"countdown":10800}],"fruitNum":1,"acceleratorsNum":0,"targetVideoNum":1,"currentVideoNum":0,"stopSecond":0}]
* rate : 50
* configNum : 2
*/
private int rate;
private int configNum;
private float timeRate;
private List<LandListEntity> landList;
public float getTimeRate() {
return timeRate;
}
public void setTimeRate(float timeRate) {
this.timeRate = timeRate;
}
public int getRate() {
return rate;
}
public void setRate(int rate) {
this.rate = rate;
}
public int getConfigNum() {
return configNum;
}
public void setConfigNum(int configNum) {
this.configNum = configNum;
}
public List<LandListEntity> getLandList() {
return landList;
}
public void setLandList(List<LandListEntity> landList) {
this.landList = landList;
}
}
library/src/main/java/com/ym/library/module/NewsEntity.kt
View file @ 491070d2
......@@ -74,7 +74,7 @@ class NewsEntity : Serializable {
var pubDate: String? = ""
var images: List<String>? = null
var icon_url: String? = null
var sid: Int = 0
var sid: Int? = 0
var tabid: String? = ""
var image_url: String? = ""
var deep_url_re: String? = ""
......
library/src/main/java/com/ym/library/module/WithdrawEntity.kt
View file @ 491070d2
......@@ -20,10 +20,29 @@ class WithdrawEntity {
var desc: String? = ""
var ifUse: Int = 0 //代表提过现了
var type: Int = 0
var reason: String = ""
var reason: String? = ""
var time: String = ""
var wdAmount: Double? = 0.0
var result: String = ""
var sid: String = ""
var cashStr: String = ""
var text: String? = ""
var clockId: Int? = 0
var targetNum: Int? = 0
var ifHide: Int? = 0
var buttonStatus: Int? = 0 //按钮跳转 0 不跳转 1 福利页 2 首页
var ext: Ext? = null
var buttonText: String? = ""
var isWelfarePage = false
var isHomePage = false
var awardNum:String = ""
class Ext {
var current: Int? = 0
var max: Int? = 0
var clock: String? = ""
var title: String? = ""
var desc: String? = ""
var clockStatus: Int? = 0
}
}
library/src/main/java/com/ym/library/net/IGameApi.kt
View file @ 491070d2
......@@ -38,7 +38,7 @@ interface IGameApi {
* @return
*/
@GET(NetConfig.Game.URL_GAME_LIST_LAND)
fun getListLand(): Observable<Response<List<LandListEntity>>>
fun getListLand(): Observable<Response<NewLandListEntity>>
/**
* 云朵加速
......@@ -58,7 +58,8 @@ interface IGameApi {
@POST(NetConfig.Game.URL_GAME_UNLOCK_LAND)
fun getUnlockLand(
@Query("id") id: Int,
@Query("type") type: Int
@Query("type") type: Int,
@Query("second") second: Int
): Observable<Response<StatusEntity>>
/**
......@@ -77,7 +78,7 @@ interface IGameApi {
* @return
*/
@POST(NetConfig.Game.URL_GAME_BUY_SEED)
fun getBuySeed(@Query("id") id: Int): Observable<Response<StatusEntity>>
fun getBuySeed(@Query("id") id: Int,@Query("second") second: Int): Observable<Response<StatusEntity>>
/**
* 仓库
......@@ -131,7 +132,7 @@ interface IGameApi {
* @return
*/
@POST(NetConfig.Game.URL_GAME_INCR_SEED)
fun getVideoSeedReceive(@Query("id") id: Int): Observable<Response<StatusEntity>>
fun getVideoSeedReceive(@Query("id") id: Int,@Query("second") second: Int): Observable<Response<StatusEntity>>
/**
* 看视频获得加速剂
......@@ -337,7 +338,7 @@ interface IGameApi {
* @paramq
* @return
*/
@GET(NetConfig.Game.URL_GAME_HOME_WD_LIST)
@GET(NetConfig.Game.URL_GAME_ORDER_LIST)
fun getHomeWList(): Observable<Response<List<HomeListEntity>>>
/**
......
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ 491070d2
......@@ -185,12 +185,12 @@ public class NetConfig {
public static class Withdraw {
public static final String URL_USER_WITHDRA_LIST = "app/v1/gs/withdraw/config";//获取配置列表
public static final String URL_USER_WITHDRA_LIST = "app/v1/game/msdh/list/cash";//获取配置列表
public static final String URL_USER_GUESSMUSIC_LOTTERY = "app/v1/gs/guessMusic/lottery";//我的抽奖/提现列表
public static final String URL_USER_LOTTERY_CONFIG = "app/v1/gs/lottery/config";//抽奖转盘配置
public static final String URL_USER_LOTTERY_RESULT = "app/v1/gs/lottery/result";//抽奖转盘抽奖结果
public static final String URL_USER_GS_PAGE_INFO = "app/v1/gs/gs_page_info";//用户剩余货币
public static final String URL_USER_GS_DO_WD = "app/v1/gs/do_wd";//提现
public static final String URL_USER_GS_DO_WD = "app/v1/game/msdh/do_wd";//提现
public static final String URL_USER_GS_COIN2CASH = "app/v1/gs/coin2cash";//金币兑换现金
public static final String URL_USER_WD_HISTORY = "app/v1/gs/wd/history";//提现记录
public static final String URL_USER_GS_DO_LOTTERY_WD = "app/v2/game/lottery_wd";//我的抽奖提现
......@@ -221,11 +221,12 @@ public class NetConfig {
public static final String URL_GAME_BUY_SEED = "app/v1/game/farm/buy_seed";//金币购买种子
public static final String URL_GAME_CLOUD_SPEED = "app/v1/game/farm/cloud_speed";//云朵加速
public static final String URL_GAME_HOME_INFO = "app/v1/game/farm/home_info";//首页信息
public static final String URL_GAME_LIST_LAND = "app/v1/game/farm/list_land";//地块列表
// public static final String URL_GAME_LIST_LAND = "app/v1/game/farm/list_land";//菜园地块列表
public static final String URL_GAME_OPEN_BOX = "app/v1/game/farm/open_box";//开宝箱
public static final String URL_GAME_ORDER_DATA = "app/v1/game/farm/order_data";//订单数据
public static final String URL_GAME_ORDER_RECEIVE = "app/v1/game/farm/order_receive";//订单领取
public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
// public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
public static final String URL_GAME_USE_ACCELERATORS = "app/v1/game/farm/use_accelerators";//加速剂加速
public static final String URL_GAME_WAREHOUSE_DATA = "app/v1/game/farm/warehouseData";//仓库列表
public static final String URL_GAME_TURNTABLE_LIST = "app/v1/game/farm/turntable_list";//转盘列表
......@@ -240,8 +241,8 @@ public class NetConfig {
public static final String URL_GAME_FARM_RANK_RECEIVE = "app/v1/game/farm/rank_receive";//排行榜领取
public static final String URL_GAME_THIRD_PARTY = "app/v1/game/third_party";//加速剂任务看视频
public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口
// public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
// public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口
public static final String URL_GAME_WD_HISTORY = "app/v1/game/ddcy/wd_history";//兑换记录
public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receiveV2";//加速剂任务领取
public static final String URL_GAME_USER_GUIDE = "app/v1/game/ddcy/user_guide";
......@@ -268,10 +269,20 @@ public class NetConfig {
public static final String URL_COLLECT_CARD_OPEN = "app/v1/collect-card/open";//开宝箱
public static final String URL_COLLECT_CARD_ADV_PUT_OR_ADD = "app/v1/collect-card/advPutOrAdd";//看广告单个图片获取或者拼图
public static final String URL_COLLECT_CARD_ADD_CARD = "app/v1/collect-card/addCard";//收金币获得卡片
public static final String URL_GAME_HOME_WD_LIST = "app/v1/game/ddcy/home_wd_list";//首页展示果实列表
// public static final String URL_GAME_HOME_WD_LIST = "app/v1/game/ddcy/home_wd_list";//首页展示果实列表
public static final String URL_CLOCK_BOX_RECEIVE = "app/v1/game/ddcy/clock_box_receive";//打卡普通打卡任务领取
public static final String URL_GAME_VIDEO_TASK_COMPLETE = "app/v1/game/video_task_complete";//看领金币视频任务
public static final String URL_GAME_WAREHOUSEDATA = "app/v1/game/ddcy/warehouseData";//仓库列表
//=========================================花园=========================================
// public static final String URL_GAME_LIST_LAND = "app/v1/game/ddhy/list_land";//花园地块列表
public static final String URL_GAME_LIST_LAND = "app/v1/game/ddhy/list_land_V2";//花园地块列表
// public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land";//花园 解锁地块/种植种子/收获果实
public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land_V2";//花园 解锁地块/种植种子/收获果实/解锁倒计时
public static final String URL_GAME_ORDER_LIST = "app/v1/game/ddhy/list_order";//花园 订单列表
public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddhy/withdraw_list";//兑换列表
public static final String URL_GAME_DOWD = "app/v1/game/ddhy/do_wd";//兑换接口
}
}
library/src/main/java/com/ym/library/net/SplashPresenter.kt
View file @ 491070d2
......@@ -353,9 +353,10 @@ class SplashPresenter : SplashContract.Presenter {
// Constant.Param.env = CesCore.getInstance().Ckwork(SettingPreference.getAndroidId())
// }
// }
// deviceLogin()
deviceLogin()
// getUserInfo()
mView.jumpPage()
// TODO
// mView.jumpPage()
}
private fun deviceLogin() {
......
library/src/main/java/com/ym/library/router/RounterApi.kt
View file @ 491070d2
......@@ -254,4 +254,7 @@ interface RounterApi {
@RounterUri(Constant.scheme + "://withdrawals_record")
fun getIntentSWithdrawalsRecord(): Intent
@RounterUri(Constant.scheme + "://user_info")
fun getIntentUserInfo(): Intent
}
\ No newline at end of file
library/src/main/java/com/ym/library/utils/AdUtils.kt
View file @ 491070d2
......@@ -5,6 +5,7 @@ import android.os.Handler
import android.os.Message
import android.util.Log
import android.widget.FrameLayout
import com.umeng.commonsdk.debug.E
import com.ym.admodule.config.AdManager
import com.ym.admodule.config.ZXADSizeConfig
import com.ym.admodule.listener.ZXADVideoListener
......@@ -35,66 +36,59 @@ object AdUtils {
fun playRewardAd(activity: Activity, actionName: String, listener: IAdVideoListener) {
this.activity = activity
AdManager.playRewardAd(
AD_REWARD_VIDIO,
actionName,
activity,
object : ZXADVideoListener {
override fun onSuccess() {}
try {
AdManager.playRewardAd(
AD_REWARD_VIDIO,
actionName,
activity,
object : ZXADVideoListener {
override fun onSuccess() {}
override fun onAdClose() {
listener?.onAdClose()
//预加载
loadNextCacheRewardVideoAd(activity)
//看视频上报
getVideoAcceleratorsReceive();
handler?.removeCallbacksAndMessages(null)
}
override fun onAdClose() {
listener?.onAdClose()
//预加载
loadNextCacheRewardVideoAd(activity)
//看视频上报
getVideoAcceleratorsReceive();
handler?.removeCallbacksAndMessages(null)
}
override fun onAdShow() {
Utils.showToast(activity, "看完视频可获得奖励")
handler?.sendEmptyMessageDelayed(0, 2000)
}
override fun onAdShow() {
Utils.showToast(activity, "看完视频可获得奖励")
handler?.sendEmptyMessageDelayed(0, 2000)
}
override fun onAdVideoBarClick() {
Log.d(TAG, "onAdVideoBarClick:")
}
override fun onAdVideoBarClick() {
Log.d(TAG, "onAdVideoBarClick:")
}
override fun onError(errorMsg: String?) {
listener?.onError(errorMsg)
Log.d(TAG, "onError:" + errorMsg)
}
override fun onError(errorMsg: String?) {
listener?.onError(errorMsg)
Log.d(TAG, "onError:" + errorMsg)
}
})
})
} catch (e: Exception) {
}
}
fun showFeedAd(activity: Activity, actionName: String, view: FrameLayout) {
AdManager.showFeedAd(
AD_IMG_FADE,
actionName,
ZXADSizeConfig(
// Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280
Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 56,
((Utils.px2dip(activity.windowManager?.defaultDisplay?.width!!.toFloat()) - 56) * 0.66).toInt()
),
activity,
view
)
// try {
// view.postDelayed(object :Runnable {
// override fun run() {
// if(activity?.isFinishing){
// return
// }
//
// activity?.runOnUiThread() {
//
// }
// }
// },0)
// } catch (e: Exception) {
// }
try {
AdManager.showFeedAd(
AD_IMG_FADE,
actionName,
ZXADSizeConfig(
// Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 40, 280
Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 56,
((Utils.px2dip(activity.windowManager?.defaultDisplay?.width!!.toFloat()) - 56) * 0.66).toInt()
),
activity,
view
)
} catch (e: Exception) {
}
}
//预加载激励
......
library/src/main/java/com/ym/library/utils/CenterDialog.kt
View file @ 491070d2
......@@ -69,7 +69,9 @@ object CenterDialog : BaseDialog() {
mDialogView.findViewById<TextView>(R.id.btn_update_start).setOnClickListener {
listener.onClick(it)
}
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
/**
......@@ -104,7 +106,9 @@ object CenterDialog : BaseDialog() {
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
// /**
......@@ -411,7 +415,9 @@ object CenterDialog : BaseDialog() {
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!context?.isFinishing) {
mDialog?.show()
}
}
......@@ -435,7 +441,9 @@ object CenterDialog : BaseDialog() {
}, 2000)
try {
if (context != null && !context.isDestroyed() && !context.isFinishing()) {
coinsDialog?.show()
if (!context?.isFinishing) {
coinsDialog?.show()
}
}
} catch (e: Exception) {
......@@ -485,7 +493,9 @@ object CenterDialog : BaseDialog() {
}
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
/**
......@@ -515,7 +525,9 @@ object CenterDialog : BaseDialog() {
activity?.finish()
}
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
/**
......@@ -572,7 +584,9 @@ object CenterDialog : BaseDialog() {
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
if (!activity?.isFinishing) {
mDialog?.show()
}
}
}
\ No newline at end of file
library/src/main/java/com/ym/library/utils/CommonUtil.java
View file @ 491070d2
package com.ym.library.utils;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageInfo;
......@@ -105,7 +106,9 @@ public class CommonUtil {
.create();
mLoadingDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
mLoadingDialog.show();
if (!((Activity) context).isFinishing()) {
mLoadingDialog.show();
}
}
});
}
......
library/src/main/java/com/ym/library/utils/FilterUtils.kt 0 → 100644
View file @ 491070d2
package com.ym.library.utils
import android.graphics.Color
import android.graphics.PorterDuff
import android.graphics.drawable.Drawable
import android.view.MotionEvent
import android.widget.ImageView
object FilterUtils {
/**
* 点击效果
*/
fun addClickAlpha(view: ImageView) {
view.setOnTouchListener { _, event ->
when (event.action) {
MotionEvent.ACTION_DOWN -> {
// view.background.alpha = 155
FilterUtils.setFilter(view)
}
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
// view.background.alpha = 255
FilterUtils.removeFilter(view)
}
}
return@setOnTouchListener false
}
}
/**
* 设置滤镜
*/
private fun setFilter(view: ImageView) {
//先获取设置的src图片
var drawable: Drawable = view?.getDrawable()
//当src图片为Null，获取背景图片
if (drawable == null) {
drawable = view?.getBackground()
}
if (drawable != null) {
//设置滤镜
drawable.setColorFilter(Color.GRAY, PorterDuff.Mode.MULTIPLY)
}
}
/**
* 清除滤镜
*/
private fun removeFilter(view: ImageView) {
//先获取设置的src图片
var drawable: Drawable = view?.getDrawable()
//当src图片为Null，获取背景图片
if (drawable == null) {
drawable = view?.getBackground()
}
drawable?.clearColorFilter()
}
}
\ No newline at end of file
library/src/main/java/com/ym/library/utils/GameDialog.kt 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/anim/push_scale_in.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/anim/push_scale_out.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/drawable-xhdpi/icon_base_dialog_bg.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/drawable-xhdpi/icon_base_dialog_close.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/drawable-xhdpi/icon_record_bg.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/drawable-xhdpi/icon_speed_up_btn.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/drawable/shape_f6e6a8_r8.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/drawable/shape_fff5bc_r8.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/layout/dialog_layout_all_speed_up.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/layout/dialog_layout_get_reward.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/layout/dialog_layout_produce_gourmet.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
library/src/main/res/values/strings.xml
View file @ 491070d2
This diff is collapsed.
library/src/main/res/values/styles.xml
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/AndroidManifest.xml
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_item_dingdan.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_item_fuli.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_item_xinren.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_item_yitixian.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_record_no_history.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_setting_bg.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_user_bg.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_user_daka_bg.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_user_title.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_user_title_bg.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable-xhdpi/icon_withdrawals_record.png 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/drawable/shape_fdab2d_r6_bg.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/layout/activity_user_info.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/layout/item_user_withdraw.xml 0 → 100644
View file @ 491070d2
This diff is collapsed.
userinfo/src/main/res/values/strings.xml
View file @ 491070d2
This diff is collapsed.
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