Skip to content

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

Merge remote-tracking branch 'origin/develop_luckyfarm_1.0.1' into develop_luckyfarm_1.0.1

parents 4a7fdcbd dff5986e
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 209 deletions
app/src/main/java/com/ym/game/view/MainDialog.kt
View file @ ad52538d
...@@ -137,7 +137,7 @@ object MainDialog { ...@@ -137,7 +137,7 @@ object MainDialog {
AdManager.loadFeedAd( AdManager.loadFeedAd(
ADConfig.AD_IMG_FADE, ADConfig.AD_IMG_FADE,
(context as Activity), (context as Activity),
ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 20, 265), ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56, 245),
object : object :
ZXADExpressListener { ZXADExpressListener {
override fun onError(p1: String?) { override fun onError(p1: String?) {
...@@ -355,7 +355,7 @@ object MainDialog { ...@@ -355,7 +355,7 @@ object MainDialog {
AdManager.loadFeedAd( AdManager.loadFeedAd(
ADConfig.AD_IMG_FADE, ADConfig.AD_IMG_FADE,
(context as Activity), (context as Activity),
ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 40, 220), ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56, 245),
object : object :
ZXADExpressListener { ZXADExpressListener {
override fun onError(p1: String?) { override fun onError(p1: String?) {
......
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @ ad52538d
...@@ -304,14 +304,14 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -304,14 +304,14 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
tvTime?.visibility = View.GONE tvTime?.visibility = View.GONE
btnCountdown?.visibility = View.GONE btnCountdown?.visibility = View.GONE
btnTurntableLottery?.visibility = View.VISIBLE btnTurntableLottery?.visibility = View.VISIBLE
btnTurntableLottery?.setBackgroundResource(R.mipmap.icon_main_turntable_free_draw) btnTurntableLottery?.setBackgroundResource(R.mipmap.icon_free)
} else { } else {
//看视频抽奖 //看视频抽奖
if (data.showVideo == 1) { if (data.showVideo == 1) {
tvTime?.visibility = View.GONE tvTime?.visibility = View.GONE
btnCountdown?.visibility = View.GONE btnCountdown?.visibility = View.GONE
btnTurntableLottery?.visibility = View.VISIBLE btnTurntableLottery?.visibility = View.VISIBLE
btnTurntableLottery?.setBackgroundResource(R.drawable.icon_main_turntable_free_draw_ad) btnTurntableLottery?.setBackgroundResource(R.mipmap.icon_look_ad)
} else if (data.countDownSecond != null && data.countDownSecond!! > 0) { } else if (data.countDownSecond != null && data.countDownSecond!! > 0) {
//倒计时 //倒计时
tvTime?.visibility = View.VISIBLE tvTime?.visibility = View.VISIBLE
...@@ -403,7 +403,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -403,7 +403,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
//恢复开始的状态 //恢复开始的状态
private fun reset() { private fun reset() {
ivTurntableBg?.setImageResource(R.mipmap.icon_main_turntable_bg) ivTurntableBg?.setImageResource(R.mipmap.icon_zhuanpan_bg)
} }
/** /**
......
app/src/main/res/layout/dialog_get_water_drop.xml
View file @ ad52538d
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginRight="18dp" android:layout_marginRight="18dp"
android:background="@color/white" android:background="@color/white"
android:padding="@dimen/dp_10"
android:visibility="gone" /> android:visibility="gone" />
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_layout_open_box.xml deleted 100644 → 0
View file @ 4a7fdcbd
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginTop="71dp"
android:layout_marginRight="18dp"
android:background="@mipmap/icon_main_dialog_get_drops_bg">
<LinearLayout
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:background="@mipmap/icon_content_bg"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_get_drop_bg"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_content_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_get_drop_bg2"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_content_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_get_drop_bg3"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/btn_get_drop_happy_accept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="28dp"
android:background="@mipmap/icon_main_turntable_free_draw"
android:gravity="center"
android:text="开心收下"
android:textColor="@color/white"
android:textSize="@dimen/sp_18" />
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@mipmap/icon_top_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_40"
android:text="恭喜获得"
android:textColor="@color/white"
android:textSize="30sp" />
<ImageView
android:id="@+id/lv_get_drop_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:paddingRight="@dimen/dp_20"
android:src="@mipmap/icon_main_popup_close" />
</RelativeLayout>
<FrameLayout
android:id="@+id/layout_get_drop_ad"
android:layout_width="match_parent"
android:layout_height="265dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginRight="18dp"
android:background="@color/white"
android:visibility="gone" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_turntable.xml
View file @ ad52538d
...@@ -45,15 +45,15 @@ ...@@ -45,15 +45,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="@mipmap/icon_main_turntable_bg" /> android:src="@mipmap/icon_zhuanpan_bg" />
<ImageView <ImageView
android:id="@+id/iv_main_turntable_center" android:id="@+id/iv_main_turntable_center"
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="@dimen/dp_20" android:layout_marginTop="@dimen/dp_107"
android:src="@mipmap/icon_main_turntable_center" /> android:src="@mipmap/icon_zhizhen" />
</RelativeLayout> </RelativeLayout>
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:src="@mipmap/icon_main_turntable_free_draw_countdown" android:src="@mipmap/icon_next_free"
android:visibility="gone" /> android:visibility="gone" />
<TextView <TextView
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
android:id="@+id/btn_turntable_lottery" android:id="@+id/btn_turntable_lottery"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@mipmap/icon_main_turntable_free_draw" android:background="@mipmap/icon_free"
android:gravity="center" android:gravity="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="20sp" android:textSize="20sp"
......
userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt
View file @ ad52538d
...@@ -57,52 +57,58 @@ class SettingActivity : BaseActivity() { ...@@ -57,52 +57,58 @@ class SettingActivity : BaseActivity() {
updateVersionManager?.checkUpdate(true) updateVersionManager?.checkUpdate(true)
} }
AdManager.loadFeedAd(ADConfig.AD_IMG_FADE,this, ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat())-20,265), object : AdManager.loadFeedAd(
ZXADExpressListener { ADConfig.AD_IMG_FADE,
override fun onError(p1: String?) { this,
ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 60, 265),
object :
ZXADExpressListener {
override fun onError(p1: String?) {
} }
override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) { override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) {
} }
override fun onAdClicked(newsEntity: NewsEntity) { override fun onAdClicked(newsEntity: NewsEntity) {
} }
override fun onAdShow(newsEntity: NewsEntity) { override fun onAdShow(newsEntity: NewsEntity) {
} }
override fun onRenderFail(s: String) { override fun onRenderFail(s: String) {
} }
override fun onRenderSuccess() { override fun onRenderSuccess() {
} }
override fun onDownloadFinished() { override fun onDownloadFinished() {
} }
override fun onInstalled() { override fun onInstalled() {
} }
override fun onDownloadFailed() { override fun onDownloadFailed() {
} }
override fun onDownloadPaused() { override fun onDownloadPaused() {
} }
override fun onDownloadActive() { override fun onDownloadActive() {
} }
override fun onIdle() { override fun onIdle() {
} }
override fun onFail() { override fun onFail() {
} }
override fun onSuccess() { override fun onSuccess() {
} }
},id_ad_frame_view) },
id_ad_frame_view
)
} }
......
userinfo/src/main/res/layout/activity_setting.xml
View file @ ad52538d
...@@ -88,7 +88,8 @@ ...@@ -88,7 +88,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="15dp" android:layout_marginLeft="15dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginRight="15dp" /> android:layout_marginRight="15dp"
android:layout_gravity="center_horizontal"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
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