Skip to content

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

提交最后代码

parent 5cc21ecc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2205 additions and 262 deletions
app/src/main/AndroidManifest.xml
View file @ 1ceaee9d
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
android:launchMode="singleTask" /> <!-- 友盟配置 --> android:launchMode="singleTask" /> <!-- 友盟配置 -->
<meta-data <meta-data
android:name="UMENG_APPKEY" android:name="UMENG_APPKEY"
android:value="5f9bb48945b2b751a91fb2d5" /> android:value="5fe446a944bb94418a636569" />
<meta-data <meta-data
android:name="UMENG_CHANNEL" android:name="UMENG_CHANNEL"
android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 微信配置 --> android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 微信配置 -->
......
app/src/main/java/com/ym/game/IUnitySendMessageCallback.kt
View file @ 1ceaee9d
...@@ -56,4 +56,7 @@ interface IUnitySendMessageCallback { ...@@ -56,4 +56,7 @@ interface IUnitySendMessageCallback {
//查询碎片角标 //查询碎片角标
fun onGetCardList(isSuccess: Boolean, result: String) fun onGetCardList(isSuccess: Boolean, result: String)
//首页底部信息
fun onBottomSuccess(isSuccess: Boolean, result: String)
} }
\ No newline at end of file
app/src/main/java/com/ym/game/adapter/SeedStoreAdapter.kt 0 → 100644
View file @ 1ceaee9d
package com.ym.game.adapter
import android.annotation.SuppressLint
import android.app.Activity
import android.content.Context
import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.AddPropEntity
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.SeedListEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
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.library.utils.AdUtils
import com.ym.library.utils.EventUtils
import com.ym.library.utils.Utils
import com.ym.modulecommon.AppliContext
class SeedStoreAdapter : BaseRecyclerAdapter<SeedListEntity, SeedStoreAdapter.ViewHolder> {
private var mContext: Context? = null
constructor(
content: Context?
) : super() {
mContext = content
}
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
var bean = mList[position]
when (bean.id) {
1 -> {
holder.item_img?.setImageResource(R.mipmap.img_cabbage)
}
2 -> {
holder.item_img?.setImageResource(R.mipmap.img_tomato)
}
3 -> {
holder.item_img?.setImageResource(R.mipmap.img_pumpkin)
}
4 -> {
holder.item_img?.setImageResource(R.mipmap.img_radish)
}
5 -> {
holder.item_img?.setImageResource(R.mipmap.img_corn)
}
6 -> {
holder.item_img?.setImageResource(R.mipmap.img_eggplant)
}
7 -> {
holder.item_img?.setImageResource(R.mipmap.img_melon)
}
8 -> {
holder.item_img?.setImageResource(R.mipmap.img_grape)
}
9 -> {
holder.item_img?.setImageResource(R.mipmap.img_strawberry)
}
}
holder.item_ownnum?.text = "拥有 ${bean.ownNum} 个"
holder.item_buy?.addClickScale()
holder.item_buy?.setOnClickListener {
if (bean.subSeedVideoNum > 0) {
EventUtils.onEvent("seed_video_btn"+bean.id+"_click","种子"+bean.id+"购买按钮点击")
AdUtils.playRewardAd(
mContext as Activity,
"seed_video_show",
object : IAdVideoListener {
override fun onAdClose() {
GameApiClient.gameApi.addprop(bean.id, 3)
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<AddPropEntity>() {
override fun onSuccess(result: AddPropEntity?) {
if (result != null) {
MainDialog.showAddDrop(
mContext as Activity,
result.awardNum,
result.type,
result.id, View.OnClickListener {
RxBusUtil.getDefault()
.send(RxBusConstant.RX_SEED_STORE_LIST)
}
)
}
}
override fun onFailure(
e: Throwable?,
code: String?,
errorMsg: String?
) {
}
})
}
override fun onError(errorMsg: String?) {
}
})
}else{
Utils.showToast(mContext, "今日次数已用完，明天再来吧～")
}
}
}
/**
* 添加点击缩放效果
*/
fun View.addClickScale(scale: Float = 0.9f, duration: Long = 150) {
this.setOnTouchListener { _, event ->
when (event.action) {
MotionEvent.ACTION_DOWN -> {
this.animate().scaleX(scale).scaleY(scale).setDuration(duration).start()
}
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
this.animate().scaleX(1f).scaleY(1f).setDuration(duration).start()
}
}
// 点击事件处理，交给View自身
this.onTouchEvent(event)
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
return ViewHolder(
LayoutInflater.from(AppliContext.get())
.inflate(R.layout.item_layout_seedstore, parent, false)
)
}
class ViewHolder : RecyclerView.ViewHolder {
var item_img: ImageView?
var item_ownnum: TextView?
var item_buy: ImageView?
constructor(
itemView: View
) : super(itemView) {
item_img = itemView.findViewById<ImageView>(R.id.id_img_item)
item_ownnum = itemView.findViewById<TextView>(R.id.id_tv_ownnum)
item_buy = itemView.findViewById<ImageView>(R.id.id_img_buy_seed)
}
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/contract/SeedStoreContract.kt 0 → 100644
View file @ 1ceaee9d
package com.ym.game.contract
import com.ym.library.module.SeedListEntity
class SeedStoreContract {
interface View {
fun SeedListResult(result: List<SeedListEntity>)
}
interface Presenter {
fun getSeedList()
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/presenter/ClockInWithdrawPresenter.kt
View file @ 1ceaee9d
...@@ -51,7 +51,7 @@ class ClockInWithdrawPresenter : ClockInWithdrawContract.Presenter { ...@@ -51,7 +51,7 @@ class ClockInWithdrawPresenter : ClockInWithdrawContract.Presenter {
fun getFlyBoxReceive(activity: Activity) { fun getFlyBoxReceive(activity: Activity) {
GameApiClient.gameApi.geClockBoxReceive() GameApiClient.gameApi.getopenBox(3)
.compose(RxSchedulers.observableIO2Main()) .compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<FlyBoxEntity>() { .subscribe(object : BaseObserver<FlyBoxEntity>() {
override fun onSuccess(result: FlyBoxEntity?) { override fun onSuccess(result: FlyBoxEntity?) {
......
app/src/main/java/com/ym/game/presenter/SeedStorePresenter.kt 0 → 100644
View file @ 1ceaee9d
package com.ym.game.presenter
import com.ym.game.contract.SeedStoreContract
import com.ym.game.contract.WareHouseContract
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.SeedListEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
class SeedStorePresenter : SeedStoreContract.Presenter {
var mView: SeedStoreContract.View
constructor(mView: SeedStoreContract.View) {
this.mView = mView
}
override fun getSeedList() {
GameApiClient.gameApi.getlistseed().compose(
RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<List<SeedListEntity>>() {
override fun onSuccess(result: List<SeedListEntity>?) {
if (result != null) {
mView?.SeedListResult(result)
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
})
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/view/SeedStoreDialog.kt 0 → 100644
View file @ 1ceaee9d
package com.ym.game.view
import android.annotation.SuppressLint
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.RecyclerView
import com.ym.bbnc.R
import com.ym.game.adapter.SeedStoreAdapter
import com.ym.game.contract.SeedStoreContract
import com.ym.game.presenter.SeedStorePresenter
import com.ym.library.module.SeedListEntity
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.library.utils.EventUtils
class SeedStoreDialog : SeedStoreContract.View {
private var context: Context? = null
private var mDialog: Dialog? = null
private var mPresenter: SeedStorePresenter? = null
private var adapter: SeedStoreAdapter? = null
//展示种子商店弹窗
fun showSeedStore(context: Context?) {
if (context == null) {
return
}
this.context = context
EventUtils.onEvent("seed_show", "种子商店弹窗曝光")
mPresenter = SeedStorePresenter(this)
mPresenter?.getSeedList()
RxBusUtil.getDefault().register(this)
mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme75)
val mDialogView =
MainDialog.showBottomDialog(
R.layout.dialog_layout_seed_store,
context,
mDialog!!,
0,
Gravity.CENTER
)
val rl = mDialog?.findViewById<RecyclerView>(R.id.rl_seed_store)
rl?.layoutManager =
GridLayoutManager(context,3)
adapter = SeedStoreAdapter(context)
rl?.adapter = adapter
mDialogView?.findViewById<ImageView>(R.id.iv_close).setOnClickListener {
mDialog?.dismiss()
RxBusUtil.getDefault().unregister(this)
}
mDialog?.setOnCancelListener {
RxBusUtil.getDefault().unregister(this)
}
mDialog?.setCanceledOnTouchOutside(false)
mDialog?.setCancelable(false)
mDialog?.show()
}
@SuppressLint()
@Subscribe(code = RxBusConstant.RX_SEED_STORE_LIST, threadMode = ThreadMode.MAIN)
fun updateList() {
mPresenter?.getSeedList()
}
override fun SeedListResult(result: List<SeedListEntity>) {
adapter?.clear()
adapter?.appendToList(result)
adapter?.notifyDataSetChanged()
}
}
\ No newline at end of file
app/src/main/res/drawable/select_get_box.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_open_box" android:state_pressed="false"/>
<item android:drawable="@drawable/icon_open_box_press" android:state_pressed="true"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/select_get_one.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/icon_get_one" android:state_pressed="false"/>
<item android:drawable="@mipmap/icon_get_one_press" android:state_pressed="true"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/select_get_two.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/icon_get_two" android:state_pressed="false"/>
<item android:drawable="@mipmap/icon_get_two_press" android:state_pressed="true"/>
</selector>
\ No newline at end of file
app/src/main/res/layout/dialog_cloud_speed.xml
View file @ 1ceaee9d
...@@ -7,118 +7,86 @@ ...@@ -7,118 +7,86 @@
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="345.5dp"
android:layout_height="370dp" android:layout_height="358dp"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"> >
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="313dp" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:background="@mipmap/icon_bg_shifei" />
android:scaleType="fitXY"
android:src="@mipmap/icon_main_dialog_get_drops_bg" />
<ImageView <ImageView
android:id="@+id/id_img_close_cloud_speed" android:id="@+id/id_img_close_cloud_speed"
android:layout_width="wrap_content" android:layout_width="52dp"
android:layout_height="wrap_content" android:layout_height="52dp"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginTop="65dp" android:layout_marginTop="65dp" />
android:src="@mipmap/icon_new_close" />
<RelativeLayout
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 <LinearLayout
android:layout_width="wrap_content" android:id="@+id/id_ll_content"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_centerHorizontal="true" android:layout_height="wrap_content"
android:layout_marginTop="35dp" android:layout_centerHorizontal="true"
android:src="@drawable/icon_speed_cloud_title" /> android:layout_marginLeft="28dp"
android:layout_marginTop="110dp"
android:layout_marginRight="@dimen/dp_26"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible">
<LinearLayout <TextView
android:id="@+id/id_ll_content" android:id="@+id/id_tv_speed_time"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="150dp" android:layout_height="wrap_content"
android:layout_below="@+id/id_tv_gongxi_get" android:text="所有土地获得20分钟加速"
android:layout_centerHorizontal="true" android:textColor="#6A231A"
android:layout_marginLeft="28dp" android:textSize="@dimen/sp_15"
android:layout_marginTop="@dimen/dp_121" android:textStyle="bold" />
android:layout_marginRight="@dimen/dp_26"
android:gravity="center"
android:orientation="vertical"
android:visibility="visible"
>
<TextView
android:id="@+id/id_tv_speed_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#6A231A"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerInParent="true"
android:src="@drawable/icon_light" />
<ImageView
android:layout_width="125dp"
android:layout_height="114dp"
android:layout_centerInParent="true"
android:src="@drawable/icon_cloud"
android:visibility="visible" />
</RelativeLayout>
</LinearLayout>
<ImageView <ImageView
android:id="@+id/id_img_all_speed"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_centerInParent="true"
android:layout_centerHorizontal="true" android:src="@mipmap/icon_cloud"
android:layout_marginBottom="@dimen/dp_36" android:visibility="visible" />
android:src="@drawable/select_all_speed" />
<TextView </LinearLayout>
android:id="@+id/id_cloud_speed_num"
android:layout_width="wrap_content" <ImageView
android:layout_height="wrap_content" android:id="@+id/id_img_all_speed"
android:layout_alignParentBottom="true" android:layout_width="wrap_content"
android:layout_centerHorizontal="true" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10" android:layout_alignParentBottom="true"
android:includeFontPadding="false" android:layout_centerHorizontal="true"
android:text="每天晚上0点重置视频次数 (剩余30次)" android:layout_marginBottom="@dimen/dp_44"
android:textColor="#864F1C" /> android:src="@drawable/select_all_speed" />
</RelativeLayout>
<TextView
android:id="@+id/id_cloud_speed_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_22"
android:includeFontPadding="false"
android:text="每天晚上0点重置视频次数 (剩余30次)"
android:textColor="#864F1C"
android:textSize="10sp" />
</RelativeLayout> </RelativeLayout>
<FrameLayout <FrameLayout
android:id="@+id/layout_get_drop_ad" android:id="@+id/layout_get_drop_ad"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_5" android:layout_marginLeft="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_40" android:layout_marginTop="@dimen/dp_40"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_5" android:layout_marginRight="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_10"
android:background="@color/white" android:background="@color/white"
android:visibility="gone" /> android:visibility="gone" />
......
app/src/main/res/layout/dialog_layout_drop_or_warm.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="345.5dp"
android:layout_height="358dp"
android:orientation="vertical">
<ImageView
android:id="@+id/img_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_bg_one" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_alignParentRight="true"
android:layout_marginTop="60dp" />
<TextView
android:id="@+id/tv_jiasu_time"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_34"
android:layout_centerHorizontal="true"
android:layout_marginTop="103dp"
android:gravity="center"
android:includeFontPadding="false"
android:text="浇水使作物提前10分钟成熟"
android:textColor="#6A231A"
android:textSize="@dimen/sp_15"
android:textStyle="bold" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="113dp">
<ImageView
android:id="@+id/img_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_bg_shachongji" />
<TextView
android:id="@+id/id_tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="117dp"
android:includeFontPadding="false"
android:text="已拥有"
android:textColor="#6A231A"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
</RelativeLayout>
<ImageView
android:id="@+id/img_get"
android:layout_width="228dp"
android:layout_height="51dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="262.5dp" />
<com.ym.game.wedget.MediumBoldTextView
android:id="@+id/tv_shengxu_num"
android:layout_width="wrap_content"
android:layout_height="26dp"
android:layout_below="@+id/img_get"
android:layout_centerHorizontal="true"
android:gravity="center"
android:includeFontPadding="false"
android:text="今天剩余x次"
android:textColor="#864F1C"
android:textSize="10sp" />
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_layout_get_add_drop.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="345.5dp"
android:layout_height="358dp"
android:orientation="vertical">
<ImageView
android:id="@+id/img_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_bg_get_shachongji" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_alignParentRight="true"
android:layout_marginTop="60dp" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="113dp">
<ImageView
android:id="@+id/img_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_bg_shachongji"
android:visibility="gone" />
<ImageView
android:id="@+id/img_zhongzi"
android:layout_width="61dp"
android:layout_height="69dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_20"
android:src="@mipmap/img_cabbage"
android:visibility="gone" />
<TextView
android:id="@+id/id_tv_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_115"
android:includeFontPadding="false"
android:text="+2"
android:textColor="#6A231A"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
</RelativeLayout>
<ImageView
android:id="@+id/img_get"
android:layout_width="228dp"
android:layout_height="51dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="270dp"
android:src="@drawable/btn_selector" />
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_layout_get_box.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<!-- <RelativeLayout-->
<!-- android:layout_width="332dp"-->
<!-- android:layout_height="316dp">-->
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentBottom="true"-->
<!-- android:background="@mipmap/icon_bg_302" />-->
<!-- <RelativeLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginTop="-1dp"-->
<!-- android:background="@mipmap/icon_title_bg_220">-->
<!-- <com.ym.game.wedget.FontTextView-->
<!-- android:id="@+id/id_tv_worm_title"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="48dp"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="恭喜获得宝箱"-->
<!-- android:textColor="#722E01"-->
<!-- android:textSize="22sp" />-->
<!-- </RelativeLayout>-->
<!-- <ImageView-->
<!-- android:id="@+id/iv_get_box_close"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_marginTop="-4dp"-->
<!-- android:layout_marginRight="-4dp"-->
<!-- android:src="@mipmap/icon_new_close" />-->
<!-- <LinearLayout-->
<!-- android:id="@+id/id_ll_content"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_below="@+id/iv_get_box_close"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical">-->
<!-- <com.ym.game.wedget.FontTextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_marginTop="@dimen/dp_28"-->
<!-- android:layout_marginBottom="@dimen/dp_19"-->
<!-- android:gravity="center"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="随机获得金币、加速剂、种子"-->
<!-- android:textColor="#722E01"-->
<!-- android:textSize="@dimen/sp_17" />-->
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="@dimen/dp_24"-->
<!-- android:background="@mipmap/icon_box" />-->
<!-- <ImageView-->
<!-- android:id="@+id/btn_get_box_btn"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="@dimen/dp_10"-->
<!-- android:src="@mipmap/icon_box_open" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_get_box_num"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:includeFontPadding="false"-->
<!-- android:text="今天剩余x次"-->
<!-- android:textColor="#9C5900"-->
<!-- android:textSize="13sp"/>-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<RelativeLayout
android:layout_width="345.5dp"
android:layout_height="358dp"
android:background="@drawable/icon_bg_get_box"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_get_box_close"
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_alignParentRight="true"
android:layout_marginTop="60dp" />
<ImageView
android:layout_width="131dp"
android:layout_height="133dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="135dp"
android:background="@mipmap/icon_box" />
<TextView
android:layout_width="wrap_content"
android:layout_height="55dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="103.5dp"
android:gravity="center"
android:includeFontPadding="false"
android:lineSpacingExtra="5dp"
android:text="开宝箱可随机获得\n种子、杀虫剂、浇水次数"
android:textColor="#722E01"
android:textSize="@dimen/sp_15"
android:textStyle="bold" />
<ImageView
android:id="@+id/btn_get_box_btn"
android:layout_width="228dp"
android:layout_height="51dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="262.5dp"
android:src="@drawable/select_get_box" />
<com.ym.game.wedget.MediumBoldTextView
android:id="@+id/tv_get_box_num"
android:layout_width="wrap_content"
android:layout_height="27dp"
android:layout_below="@+id/btn_get_box_btn"
android:layout_centerHorizontal="true"
android:gravity="center"
android:includeFontPadding="false"
android:text="今天剩余x次"
android:textColor="#864F1C"
android:textSize="10sp" />
</RelativeLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_layout_seed_store.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="344dp"
android:layout_height="514.5dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_bg_seed_store" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="52dp"
android:layout_height="52dp"
android:layout_alignParentRight="true"
android:layout_marginTop="60dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_seed_store"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:layout_marginTop="126dp"
android:layout_marginBottom="@dimen/dp_30"/>
</RelativeLayout>
</LinearLayout>
app/src/main/res/layout/dialog_seed_not_enough.xml
View file @ 1ceaee9d
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_zhongzi"
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"
...@@ -74,8 +75,20 @@ ...@@ -74,8 +75,20 @@
android:scaleY="1.5" android:scaleY="1.5"
android:src="@mipmap/baicai_fruit" android:src="@mipmap/baicai_fruit"
android:visibility="visible" /> android:visibility="visible" />
</RelativeLayout> </RelativeLayout>
<TextView
android:id="@+id/tv_seed_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rl_zhongzi"
android:layout_centerHorizontal="true"
android:text=""
android:textColor="#6A231A"
android:textSize="20sp"
android:textStyle="bold"/>
<RelativeLayout <RelativeLayout
android:id="@+id/id_img_bug_seed" android:id="@+id/id_img_bug_seed"
...@@ -83,7 +96,8 @@ ...@@ -83,7 +96,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@id/id_img_receive_seed" android:layout_above="@id/id_img_receive_seed"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_10"> android:layout_marginBottom="@dimen/dp_10"
android:visibility="gone">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -110,7 +124,7 @@ ...@@ -110,7 +124,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_40" android:layout_marginBottom="@dimen/dp_50"
android:src="@drawable/select_seed_receive" /> android:src="@drawable/select_seed_receive" />
<TextView <TextView
...@@ -119,7 +133,7 @@ ...@@ -119,7 +133,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_10" android:layout_marginBottom="@dimen/dp_20"
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="每天晚上0点重置视频次数 (剩余10次)" android:text="每天晚上0点重置视频次数 (剩余10次)"
android:textColor="#864F1C" /> android:textColor="#864F1C" />
......
app/src/main/res/layout/item_layout_seedstore.xml 0 → 100644
View file @ 1ceaee9d
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/dp_100"
android:layout_height="wrap_content"
android:layout_marginBottom="23.5dp"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/id_img_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/img_cabbage"/>
<TextView
android:id="@+id/id_tv_ownnum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="222"
android:textColor="#8F4C07"
android:textSize="@dimen/sp_14"
android:layout_marginTop="@dimen/dp_12" />
<ImageView
android:id="@+id/id_img_buy_seed"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_buy_seed"
android:layout_marginTop="7dp"
/>
</LinearLayout>
app/version.properties
View file @ 1ceaee9d
PACKAGE_NAME=com.ym.bbnc PACKAGE_NAME=com.ym.bbnc
VERSION_CODE=11 VERSION_CODE=13
VERSION_NAME=1.1.0 VERSION_NAME=1.2.0
\ No newline at end of file \ No newline at end of file
library/src/main/java/com/ym/library/module/AddPropEntity.kt 0 → 100644
View file @ 1ceaee9d
package com.ym.library.module
class AddPropEntity {
var type: Int = 0
var awardNum: Int = 0
var id: Int = 0
}
\ No newline at end of file
library/src/main/java/com/ym/library/module/BottomInfoEntity.kt 0 → 100644
View file @ 1ceaee9d
package com.ym.library.module
class BottomInfoEntity {
var accNum: Int = 0//加速剂数量
var clearBugNum: Int = 0//除虫剂数量
var accSecond: Int = 0//加速剂减少秒数
}
\ No newline at end of file
library/src/main/java/com/ym/library/module/GuideEntity.kt
View file @ 1ceaee9d
...@@ -3,4 +3,5 @@ package com.ym.library.module ...@@ -3,4 +3,5 @@ package com.ym.library.module
class GuideEntity { class GuideEntity {
var status: Int = 0 var status: Int = 0
var video: Int = 0
} }
\ No newline at end of file
library/src/main/java/com/ym/library/module/HomeInfoEntity.java
View file @ 1ceaee9d
...@@ -29,10 +29,19 @@ public class HomeInfoEntity { ...@@ -29,10 +29,19 @@ public class HomeInfoEntity {
private int maxClockNum;//所需打卡数量 private int maxClockNum;//所需打卡数量
private int subAcceleratorsVideoNum;//看加速剂不足视频剩余次数 private int subAcceleratorsVideoNum;//看加速剂不足视频剩余次数
private int subSeedVideoNum;//看种子不足视频剩余次数 private int subSeedVideoNum;//看种子不足视频剩余次数
private int subClearBugVideoNum;;//看视频获取除虫剂剩余看视频次数
private int acceleratorsVideoNum;//看视频给加速剂的个数 private int acceleratorsVideoNum;//看视频给加速剂的个数
private int lotteryNum;//转盘剩余次数 private int lotteryNum;//转盘剩余次数
private int isPopup;//是否选过商品 private int isPopup;//是否选过商品
public int getSubClearBugVideoNum() {
return subClearBugVideoNum;
}
public void setSubClearBugVideoNum(int subClearBugVideoNum) {
this.subClearBugVideoNum = subClearBugVideoNum;
}
public int getIsPopup() { public int getIsPopup() {
return isPopup; return isPopup;
} }
......
library/src/main/java/com/ym/library/module/SeedListEntity.kt 0 → 100644
View file @ 1ceaee9d
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