Skip to content

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

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

# Conflicts:
#	app/src/main/java/com/ym/game/application/BaseApplication.kt
parents b4a404b0 37e8bdd2
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 73 deletions
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt
View file @ c4b4d6ca
......@@ -167,31 +167,31 @@ class CashExchangeAdapter :
img.setImageResource(R.mipmap.ic_zuanshi)
}
1 -> {
img.setImageResource(R.mipmap.baicai_fruit)
img.setImageResource(R.mipmap.icon_flower_one)
}
2 -> {
img.setImageResource(R.mipmap.fanqiei_fruit)
img.setImageResource(R.mipmap.icon_flower_two)
}
3 -> {
img.setImageResource(R.mipmap.nangua_fruit)
img.setImageResource(R.mipmap.icon_flower_three)
}
4 -> {
img.setImageResource(R.mipmap.luobo_fruit)
img.setImageResource(R.mipmap.icon_flower_four)
}
5 -> {
img.setImageResource(R.mipmap.yumi_fruit)
img.setImageResource(R.mipmap.icon_flower_five)
}
6 -> {
img.setImageResource(R.mipmap.qiezi_fruit)
img.setImageResource(R.mipmap.icon_flower_six)
}
7 -> {
img.setImageResource(R.mipmap.xigua_fruit)
img.setImageResource(R.mipmap.icon_flower_seven)
}
8 -> {
img.setImageResource(R.mipmap.putao_fruit)
img.setImageResource(R.mipmap.icon_flower_eight)
}
9 -> {
img.setImageResource(R.mipmap.caomei_fruit)
img.setImageResource(R.mipmap.icon_flower_eight)
}
}
}
......
app/src/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt
View file @ c4b4d6ca
......@@ -71,7 +71,7 @@ class SpeedWaterTaskAdapter :
holder?.imglucky.visibility=View.VISIBLE
}
if (data?.buttonSway != null && data?.buttonSway == 1) {
if (data?.buttonSway != null && data?.buttonSway == 1&&data?.status!=1) {
startAnimator(holder?.ivStatus)
} else {
holder?.ivStatus.clearAnimation()
......
app/src/main/java/com/ym/game/adapter/WareHouseAdapter.kt
View file @ c4b4d6ca
......@@ -32,31 +32,31 @@ class WareHouseAdapter : BaseRecyclerAdapter<FlyBoxEntity, WareHouseAdapter.View
2 -> {
when (bean.id) {
1 -> {
holder.item_img?.setImageResource(R.mipmap.img_cabbage)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_one)
}
2 -> {
holder.item_img?.setImageResource(R.mipmap.img_tomato)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_two)
}
3 -> {
holder.item_img?.setImageResource(R.mipmap.img_pumpkin)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_three)
}
4 -> {
holder.item_img?.setImageResource(R.mipmap.img_radish)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_four)
}
5 -> {
holder.item_img?.setImageResource(R.mipmap.img_corn)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_five)
}
6 -> {
holder.item_img?.setImageResource(R.mipmap.img_eggplant)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_six)
}
7 -> {
holder.item_img?.setImageResource(R.mipmap.img_melon)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_seven)
}
8 -> {
holder.item_img?.setImageResource(R.mipmap.img_grape)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_eight)
}
9 -> {
holder.item_img?.setImageResource(R.mipmap.img_strawberry)
holder.item_img?.setImageResource(R.mipmap.icon_zhongzi_eight)
}
}
}
......@@ -64,31 +64,31 @@ class WareHouseAdapter : BaseRecyclerAdapter<FlyBoxEntity, WareHouseAdapter.View
3 -> {
when (bean.id) {
1 -> {
holder.item_img?.setImageResource(R.mipmap.baicai_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_one)
}
2 -> {
holder.item_img?.setImageResource(R.mipmap.fanqiei_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_two)
}
3 -> {
holder.item_img?.setImageResource(R.mipmap.nangua_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_three)
}
4 -> {
holder.item_img?.setImageResource(R.mipmap.luobo_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_four)
}
5 -> {
holder.item_img?.setImageResource(R.mipmap.yumi_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_five)
}
6 -> {
holder.item_img?.setImageResource(R.mipmap.qiezi_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_six)
}
7 -> {
holder.item_img?.setImageResource(R.mipmap.xigua_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_seven)
}
8 -> {
holder.item_img?.setImageResource(R.mipmap.putao_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_eight)
}
9 -> {
holder.item_img?.setImageResource(R.mipmap.caomei_fruit)
holder.item_img?.setImageResource(R.mipmap.icon_flower_eight)
}
}
......
app/src/main/java/com/ym/game/adapter/WateringTaskAdpater.kt
View file @ c4b4d6ca
......@@ -68,7 +68,7 @@ class WateringTaskAdpater :
holder?.imglucky.visibility=View.VISIBLE
}
if (data?.buttonSway != null && data?.buttonSway == 1) {
if (data?.buttonSway != null && data?.buttonSway == 1&&data?.status!=1) {
startAnimator(holder?.ivStatus)
} else {
startAnimator2(holder?.ivStatus)
......
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @ c4b4d6ca
......@@ -61,7 +61,7 @@ class BaseApplication : BaseApplication() {
//TODO 上线去掉测试地址
NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
NetConfig.BASE_FEED_URL = "http://feedapitest2.zhangxinhulian.com/"
// Constant.appLs = "b59e7d03c0f91730"//appls
AdManager.init(this,"b59e7d03c0f91730")
LogUtils.getConfig().logSwitch = true
......
app/src/main/java/com/ym/game/view/MainDialog.kt
View file @ c4b4d6ca
......@@ -204,31 +204,31 @@ object MainDialog {
fun setImage(img: ImageView, id: Int) {
when (id) {
1 -> {
img.setImageResource(R.mipmap.img_cabbage)
img.setImageResource(R.mipmap.icon_zhongzi_one)
}
2 -> {
img.setImageResource(R.mipmap.img_tomato)
img.setImageResource(R.mipmap.icon_zhongzi_two)
}
3 -> {
img.setImageResource(R.mipmap.img_pumpkin)
img.setImageResource(R.mipmap.icon_zhongzi_three)
}
4 -> {
img.setImageResource(R.mipmap.img_radish)
img.setImageResource(R.mipmap.icon_zhongzi_four)
}
5 -> {
img.setImageResource(R.mipmap.img_corn)
img.setImageResource(R.mipmap.icon_zhongzi_five)
}
6 -> {
img.setImageResource(R.mipmap.img_eggplant)
img.setImageResource(R.mipmap.icon_zhongzi_six)
}
7 -> {
img.setImageResource(R.mipmap.img_melon)
img.setImageResource(R.mipmap.icon_zhongzi_seven)
}
8 -> {
img.setImageResource(R.mipmap.img_grape)
img.setImageResource(R.mipmap.icon_zhongzi_eight)
}
9 -> {
img.setImageResource(R.mipmap.img_strawberry)
img.setImageResource(R.mipmap.icon_zhongzi_eight)
}
}
......@@ -613,6 +613,13 @@ object MainDialog {
onClickListener.onClick(it)
mDialog.dismiss()
}
mDialog.setOnDismissListener(object : DialogInterface.OnDismissListener {
override fun onDismiss(p0: DialogInterface?) {
onDestroy()
AdUtils.loadFeedCacheAdToCache(activity)
}
})
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
......
app/src/main/res/layout/dialog_cloud_speed.xml
View file @ c4b4d6ca
......@@ -77,7 +77,8 @@
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerInParent="true"
android:src="@drawable/icon_light" />
android:src="@drawable/icon_light"
android:visibility="gone"/>
<ImageView
android:layout_width="125dp"
......
app/src/main/res/layout/dialog_get_welfare_drop.xml
View file @ c4b4d6ca
......@@ -88,7 +88,7 @@
android:id="@+id/iv_seed_bg"
android:layout_width="@dimen/dp_60"
android:layout_height="@dimen/dp_60"
android:src="@mipmap/img_cabbage" />
android:src="@mipmap/icon_zhongzi_one" />
<TextView
android:id="@+id/tv_seed"
......
app/src/main/res/layout/item_with_draw_list.xml
View file @ c4b4d6ca
......@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="14dp"
android:layout_marginTop="@dimen/dp_15"
android:src="@mipmap/baicai_fruit" />
android:src="@mipmap/icon_flower_one" />
<ImageView
android:id="@+id/id_img_mark"
......
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ c4b4d6ca
......@@ -179,12 +179,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";//转盘列表
......@@ -199,8 +199,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";
......@@ -234,10 +234,10 @@ public class NetConfig {
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_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land";//花园 解锁地块/种植种子/收获果实
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";//兑换接口
// public static final String URL_GAME_LIST_LAND = "app/v1/game/ddhy/list_land";//花园地块列表
// public static final String URL_GAME_UNLOCK_LAND = "app/v1/game/ddhy/unlock_land";//花园 解锁地块/种植种子/收获果实
// 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/utils/AdUtils.kt
View file @ c4b4d6ca
......@@ -51,29 +51,31 @@ object AdUtils {
fun showFeedAd(activity: Activity, actionName: String, view: FrameLayout) {
try {
view.postDelayed(object :Runnable {
override fun run() {
if(activity?.isFinishing){
return
}
activity?.runOnUiThread() {
AdManager.showFeedAd(
ADConfig.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
)
}
}
},500)
} catch (e: Exception) {
if(activity?.isFinishing){
return
}
AdManager.showFeedAd(
ADConfig.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() {
//
// activity?.runOnUiThread() {
//
// }
// }
// },500)
// } catch (e: Exception) {
// }
}
//预加载激励
......
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