Skip to content

L
LuckyFarm
Commit dd8f4df0 authored by maxiaoliang's avatar maxiaoliang
Browse files
Options

修改bug

parent 03d7cfb7
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 56 deletions
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @ dd8f4df0
...@@ -114,13 +114,6 @@ class BaseApplication : MultiDexApplication() { ...@@ -114,13 +114,6 @@ class BaseApplication : MultiDexApplication() {
sAppState = STATE_NORMAL sAppState = STATE_NORMAL
} }
if (activityCount === 0) {//从后台进入前台
var intent = Intent()
intent.setClass(applicationContext, SplashResumeActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
AppliContext.get().startActivity(intent)
}
activityCount++ activityCount++
} }
override fun onActivityResumed(activity: Activity) {} override fun onActivityResumed(activity: Activity) {}
......
app/src/main/java/com/ym/game/view/MainDialog.kt
View file @ dd8f4df0
...@@ -466,6 +466,7 @@ object MainDialog { ...@@ -466,6 +466,7 @@ object MainDialog {
mDialog?.setCancelable(false) mDialog?.setCancelable(false)
mDialog?.show() mDialog?.show()
} }
// 获取碎片红包时的弹窗
fun showDialoggetPuzzle(activity: Activity?,diffCardsNum:Int ,onClickListener: View.OnClickListener){ fun showDialoggetPuzzle(activity: Activity?,diffCardsNum:Int ,onClickListener: View.OnClickListener){
if (activity == null) return if (activity == null) return
val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme) val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme)
......
app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt
View file @ dd8f4df0
...@@ -53,7 +53,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View, ...@@ -53,7 +53,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
private var singinDropsAdapter: SigninDropsAdapter? = null private var singinDropsAdapter: SigninDropsAdapter? = null
private var wateringTaskAdpater: WateringTaskAdpater? = null private var wateringTaskAdpater: WateringTaskAdpater? = null
var tv_tomAwardNum:TextView?=null
fun init(mContext: Activity?, mListener: IDialogViewCloseCallback) { fun init(mContext: Activity?, mListener: IDialogViewCloseCallback) {
this.mListener = mListener this.mListener = mListener
this.mContext = mContext this.mContext = mContext
...@@ -79,6 +79,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View, ...@@ -79,6 +79,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
private fun initView() { private fun initView() {
tvPopupSigninDrops = view?.findViewById<TextView>(R.id.tv_popup_signin_drops) tvPopupSigninDrops = view?.findViewById<TextView>(R.id.tv_popup_signin_drops)
tv_tomAwardNum=view?.findViewById(R.id.id_tv_reward_coin)
val recyclerSigninDrops = val recyclerSigninDrops =
view?.findViewById<RecyclerView>(R.id.recycler_popup_signin_drops) view?.findViewById<RecyclerView>(R.id.recycler_popup_signin_drops)
val recyclerWatering = val recyclerWatering =
...@@ -166,7 +167,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View, ...@@ -166,7 +167,7 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
singinDropsAdapter?.clear() singinDropsAdapter?.clear()
singinDropsAdapter?.appendToList(data.signInfoList) singinDropsAdapter?.appendToList(data.signInfoList)
singinDropsAdapter?.notifyDataSetChanged() singinDropsAdapter?.notifyDataSetChanged()
tv_tomAwardNum?.text="${data.tomAwardNum}"
if (data.isPop == 1) { if (data.isPop == 1) {
//首次签到弹窗 //首次签到弹窗
MainDialog.showgetWaterDrop(mContext, 4, "签到", data.awardNum, null) MainDialog.showgetWaterDrop(mContext, 4, "签到", data.awardNum, null)
......
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @ dd8f4df0
...@@ -91,9 +91,8 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -91,9 +91,8 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
tvTime = mDialogView?.findViewById<TextView>(R.id.tv_main_turntable_time) tvTime = mDialogView?.findViewById<TextView>(R.id.tv_main_turntable_time)
btnTurntableLottery?.addClickScale() btnTurntableLottery?.addClickScale()
btnTurntableLottery?.setOnClickListener { btnTurntableLottery?.setOnClickListener {
if (Utils.isFastClick()) { if (Utils.isFastClick2()) {
if (turntables?.showVideo == 0 && turntables?.countDownSecond!! <=0) {
if (turntables?.showVideo == 0 && turntables?.countDownSecond!! < 0) {
//开启转盘 //开启转盘
EventUtils.onEvent("click_lucky_turntable_lottery", "幸运转盘抽奖") EventUtils.onEvent("click_lucky_turntable_lottery", "幸运转盘抽奖")
btnTurntableLottery?.isEnabled = false btnTurntableLottery?.isEnabled = false
...@@ -200,7 +199,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -200,7 +199,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
fun initView(data: TurntableEntity) { fun initView(data: TurntableEntity) {
tvTurntableCount?.text = "剩余次数: ${data.lotteryNum}" 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 tvTime?.visibility = View.GONE
btnCountdown?.visibility = View.GONE btnCountdown?.visibility = View.GONE
btnTurntableLottery?.visibility = View.VISIBLE btnTurntableLottery?.visibility = View.VISIBLE
......
app/src/main/res/layout/dialog_get_puzzle.xml
View file @ dd8f4df0
...@@ -5,43 +5,57 @@ ...@@ -5,43 +5,57 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="290dp" android:layout_width="match_parent"
android:layout_height="290dp" android:layout_height="370dp"
android:background="@drawable/icon_dialog_bg"> android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15">
<ImageView
android:layout_width="match_parent"
android:layout_height="313dp"
android:layout_alignParentBottom="true"
android:scaleType="fitXY"
android:src="@mipmap/icon_main_dialog_get_drops_bg" />
<ImageView <ImageView
android:id="@+id/id_img_close_get_puzzle" android:id="@+id/id_img_close_get_puzzle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="8dp" android:layout_marginTop="65dp"
android:layout_marginRight="8dp" android:src="@mipmap/icon_new_close" />
android:src="@drawable/icon_close_dialog" />
<TextView <RelativeLayout
android:id="@+id/id_tv_title" android:layout_width="match_parent"
android:layout_height="350dp"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="20dp"
android:background="@mipmap/icon_content_bg">
<ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="15dp" android:layout_marginTop="35dp"
android:includeFontPadding="false" android:src="@drawable/icon_puzzle_title" />
android:text="碎片红包"
android:textColor="#A26A3B"
android:textSize="20sp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/id_ll_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="150dp"
android:layout_below="@+id/id_tv_title" android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="46dp" android:layout_marginLeft="28dp"
android:background="@drawable/icon_white_bg" android:layout_marginTop="@dimen/dp_121"
android:layout_marginRight="@dimen/dp_26"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="visible">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
...@@ -51,33 +65,84 @@ ...@@ -51,33 +65,84 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="还差" android:text="还差"
android:textColor="#A26A3B" android:textColor="#6A231A"
android:textSize="14sp" /> android:textSize="17sp" />
<TextView <TextView
android:id="@+id/id_tv_num_puzzle" android:id="@+id/id_tv_num_puzzle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="6" android:text=" 6 "
android:textColor="#F72929" android:textColor="#E85740"
android:textSize="14sp" /> android:textSize="17sp"
android:textStyle="bold"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:text="个碎片就可以完成拼图了" android:text="个碎片就可以完成拼图了"
android:textColor="#A26A3B" android:textColor="#6A231A"
android:textSize="14sp" /> android:textSize="17sp" />
</LinearLayout> </LinearLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="看一次视频即可获得一个碎片哦！" android:text="看一次视频即可获得一个碎片哦！"
android:textColor="#ffa26a3b" android:textColor="#6A231A"
android:textSize="14sp" /> android:textSize="17sp" />
</LinearLayout>
<ImageView
android:id="@+id/id_img_sure"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_20"
android:src="@drawable/icon_sure"/>
</RelativeLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="290dp"
android:layout_height="290dp"
android:background="@drawable/icon_dialog_bg"
android:visibility="gone">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="8dp"
android:layout_marginRight="8dp"
android:src="@drawable/icon_close_dialog" />
<TextView
android:id="@+id/id_tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="15dp"
android:includeFontPadding="false"
android:text="碎片红包"
android:textColor="#A26A3B"
android:textSize="20sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_tv_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="46dp"
android:background="@drawable/icon_white_bg"
android:gravity="center"
android:orientation="vertical">
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -106,11 +171,7 @@ ...@@ -106,11 +171,7 @@
android:layout_weight="1" android:layout_weight="1"
android:gravity="center"> android:gravity="center">
<ImageView
android:id="@+id/id_img_sure"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_sure" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
library/build.gradle
View file @ dd8f4df0
...@@ -67,7 +67,7 @@ dependencies { ...@@ -67,7 +67,7 @@ dependencies {
api ("com.bx:adsdk:1.3.3"){ api ("com.bx:adsdk:1.3.3"){
exclude group: 'com.google.code.gson' exclude group: 'com.google.code.gson'
} }
api 'com.ym.admodule:admodule:1.0.2.1' api 'com.ym.admodule:admodule:1.0.2.2'
api 'com.airbnb.android:lottie:3.1.0' api 'com.airbnb.android:lottie:3.1.0'
/* api 'androidx.appcompat:appcompat:1.2.0-alpha02' /* api 'androidx.appcompat:appcompat:1.2.0-alpha02'
api 'com.android.support:design:28.0.0' api 'com.android.support:design:28.0.0'
......
library/src/main/java/com/ym/library/module/SinginEntity.kt
View file @ dd8f4df0
...@@ -8,6 +8,7 @@ class SinginEntity { ...@@ -8,6 +8,7 @@ class SinginEntity {
var isPop: Int = 0 // 1弹领取水滴弹窗 var isPop: Int = 0 // 1弹领取水滴弹窗
var totalNum: Int = 0 //连续签到水滴数量 var totalNum: Int = 0 //连续签到水滴数量
var awardNum: Int = 0 //每日首次签到水滴数量 var awardNum: Int = 0 //每日首次签到水滴数量
var tomAwardNum: Int = 0 //每日首次签到水滴数量
var signInfoList: MutableList<SignInfoListEntity> = ArrayList() var signInfoList: MutableList<SignInfoListEntity> = ArrayList()
class SignInfoListEntity { class SignInfoListEntity {
......
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