Skip to content

L
LuckyFarm
Commit a2eb69ea authored by 王雪伟's avatar 王雪伟
Browse files
Options

[提交人]：王雪伟 

[提交简述] ：神奇菜园
[实现方案] ：1.2.0  vc 15
parent a71ac763
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1509 additions and 511 deletions
app/src/main/AndroidManifest.xml
View file @ a2eb69ea
<?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.bbnc">
package="com.zxhl.game.sqcy">
<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.zxhl.game.application.BaseApplication"
android:allowBackup="true"
android:icon="@mipmap/icon_launch"
android:label="@string/app_name"
......@@ -25,7 +25,7 @@
android:theme="@style/AppTheme"
tools:replace="android:icon, android:label,android:theme">
<activity
android:name="com.ym.game.activity.WelfareActivityMy"
android:name="com.zxhl.game.activity.WelfareActivityMy"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -35,12 +35,12 @@
<data
android:host="welfare"
android:scheme="bbnc" />
android:scheme="sqcy" />
</intent-filter>
</activity>
<activity
android:name="com.ym.game.activity.ClockInWithdrawActitivy"
android:name="com.zxhl.game.activity.ClockInWithdrawActitivy"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
......@@ -50,11 +50,11 @@
<data
android:host="clockinwithdraw"
android:scheme="bbnc" />
android:scheme="sqcy" />
</intent-filter>
</activity>
<activity
android:name="com.ym.game.activity.MonopolyWebActivity"
android:name="com.zxhl.game.activity.MonopolyWebActivity"
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
......@@ -62,7 +62,7 @@
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="nomal_web"
android:scheme="bbnc" />
android:scheme="sqcy" />
</intent-filter>
</activity>
<meta-data
......@@ -76,7 +76,7 @@
android:value="portrait|landscape" />
<activity
android:name="com.ym.game.activity.SplashActivity"
android:name="com.zxhl.game.activity.SplashActivity"
android:noHistory="false"
android:theme="@style/SplashTheme">
<intent-filter>
......@@ -86,13 +86,13 @@
</intent-filter>
</activity>
<service android:name="com.ym.game.notif.NotificationService" />
<service android:name="com.zxhl.game.notif.NotificationService" />
<activity
android:name="com.ym.game.activity.WxLoginActivityMy"
android:name="com.zxhl.game.activity.WxLoginActivityMy"
android:exported="true" />
<activity
android:name="com.ym.game.GameActivity"
android:name="com.zxhl.game.GameActivity"
android:exported="true"
android:launchMode="singleTask" /> <!-- 友盟配置 -->
<meta-data
......@@ -102,7 +102,7 @@
android:name="UMENG_CHANNEL"
android:value="${UMENG_CHANNEL_VALUE}" /> <!-- 微信配置 -->
<activity
android:name=".wxapi.WXEntryActivity"
android:name="com.zxhl.game.sqcy.wxapi.WXEntryActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:exported="true"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
......
app/src/main/java/com/ym/game/activity/AdVideoListener.java → app/src/main/java/com/zxhl/game/activity/AdVideoListener.java
View file @ a2eb69ea
package com.ym.game.activity;
package com.zxhl.game.activity;
public abstract class AdVideoListener {
......
app/src/main/java/com/ym/game/activity/ClockInWithdrawActitivy.kt → app/src/main/java/com/zxhl/game/activity/ClockInWithdrawActitivy.kt
View file @ a2eb69ea
package com.ym.game.activity
package com.zxhl.game.activity
import android.app.Dialog
import android.text.Html
import android.view.View
import androidx.recyclerview.widget.LinearLayoutManager
import com.ym.bbnc.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.zxhl.game.sqcy.R
import com.zxhl.game.adapter.ClockInWithdrawAdpater
import com.zxhl.game.contract.ClockInWithdrawContract
import com.zxhl.game.presenter.ClockInWithdrawPresenter
import com.zxhl.game.view.MainDialog
import com.ym.library.MyConstant
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.module.ExchangeEntity
import com.ym.library.module.PassWithdrawEntity
import com.ym.library.net.MyBaseActivity
import com.ym.library.utils.EventUtils
import com.zxhl.game.adapter.PassWithdrawAdapter
import kotlinx.android.synthetic.main.activity_clock_in_withdraw.*
//打卡提现 福利
class ClockInWithdrawActitivy : MyBaseActivity(), ClockInWithdrawContract.View,
OnRecycleItemClickListener<ClockInWithdrawEntity.ClockInItemEntity> {
OnRecycleItemClickListener<PassWithdrawEntity.ClockInItemEntity> {
private var mPresenter: ClockInWithdrawPresenter? = null
private var mAdapter: ClockInWithdrawAdpater? = null
private var mData: ClockInWithdrawEntity.ClockInItemEntity? = null
private var mAdapter: PassWithdrawAdapter? = null
private var mData: PassWithdrawEntity.ClockInItemEntity? = null
private var isClick = false
override fun layoutID(): Int {
......@@ -43,59 +45,72 @@ class ClockInWithdrawActitivy : MyBaseActivity(), ClockInWithdrawContract.View,
private fun initAdapter() {
recycler_clock_in?.layoutManager = LinearLayoutManager(this)
mAdapter = ClockInWithdrawAdpater(this, this)
// mAdapter = ClockInWithdrawAdpater(this, this)
mAdapter = PassWithdrawAdapter(this, this)
recycler_clock_in?.adapter = mAdapter
}
override fun onItemClick(
view: View,
position: Int,
data: ClockInWithdrawEntity.ClockInItemEntity
) {
mData = data
if (!isClick) {
isClick = true
if (data.special == 1) {
EventUtils.onEvent("attendance_task_ordinary_click")
mPresenter?.getFlyBoxReceive(this)
} else if (data.special == 2) {
EventUtils.onEvent("attendance_task_withdraw_click")
mPresenter?.getDoWd(data.id!!)
}
view?.postDelayed({
isClick = false
},1000)
}
}
// override fun onItemClick(
// view: View,
// position: Int,
// data: ClockInWithdrawEntity.ClockInItemEntity
// ) {
//// mData = data
//// if (!isClick) {
//// isClick = true
//// if (data.special == 1) {
//// EventUtils.onEvent("attendance_task_ordinary_click")
//// mPresenter?.getFlyBoxReceive(this)
//// } else if (data.special == 2) {
//// EventUtils.onEvent("attendance_task_withdraw_click")
//// mPresenter?.getDoWd(data.id!!)
//// }
////
//// view?.postDelayed({
//// isClick = false
//// },1000)
//// }
//
// }
//任务列表结果
override fun clockInWithdrawListResult(result: ClockInWithdrawEntity?) {
override fun clockInWithdrawListResult(result: PassWithdrawEntity?) {
if (result != null) {
MyConstant.videoNum = result?.videoNum ?: 20
tv_clock_in_days?.text =
Html.fromHtml("已连续打卡 <font color=\"#8F2C0F\"><big>${result?.clockNum}</big></font> 天")
tv_clock_in_info?.text = "${result?.title}"
Html.fromHtml("已连续打卡 <font color=\"#F5382E\"><big>${result?.clockNum}</big></font> 天")
// tv_clock_in_info?.text = "${result?.title}"
progress_clock_in_bar?.max = result.targetNum ?: 0
progress_clock_in_bar?.progress = result.currentNum ?: 0
tv_clock_in_progress?.text = "${result.currentNum}/${result.targetNum}"
if (result?.targetNum!! - result?.currentNum!! > 0) {
tv_clock_in_desc_video?.text =
"还需要看${result?.targetNum!! - result?.currentNum!!}个视频";
} else {
tv_clock_in_desc_video?.text = "今日已打卡";
EventUtils.onEvent("dateCard_today","完成当日打卡")
}
mAdapter?.clear()
mAdapter?.appendToList(result?.list)
mAdapter?.appendToList(result?.clockData)
mAdapter?.notifyDataSetChanged()
}
}
//提现结果
override fun dowdResult(result: ExchangeEntity?) {
override fun dowdResult(result: ExchangeEntity?,num:Int) {
mPresenter?.getClockInWithdrawList()
if (result != null) {
if (result.status==1||result.status==2){
EventUtils.onEvent("dateCard_${num}", "完成${num}天打卡")
}
MainDialog?.showWithDraw(
this,
result?.status?:0,
result?.title?:"",
result?.reason?:"",
result?.buttonText?:"",
result?.buttonStatus?:0,
result?.status ?: 0,
result?.title ?: "",
result?.reason ?: "",
result?.buttonText ?: "",
result?.buttonStatus ?: 0,
null,
8,
null,
......@@ -105,4 +120,28 @@ class ClockInWithdrawActitivy : MyBaseActivity(), ClockInWithdrawContract.View,
}
}
override fun onItemClick(
view: View,
position: Int,
data: PassWithdrawEntity.ClockInItemEntity
) {
mData = data
if (!isClick) {
isClick = true
// if (data.special == 1) {
// EventUtils.onEvent("attendance_task_ordinary_click")
// mPresenter?.getFlyBoxReceive(this)
// } else if (data.special == 2) {
// EventUtils.onEvent("attendance_task_withdraw_click")
// mPresenter?.getDoWd(data.id!!)
// }
mPresenter?.getDoWd(data.id!!,data.needClockNum!!)
view?.postDelayed({
isClick = false
}, 1000)
}
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/activity/MonopolyWebActivity.java → app/src/main/java/com/zxhl/game/activity/MonopolyWebActivity.java
View file @ a2eb69ea
package com.ym.game.activity;
package com.zxhl.game.activity;
import android.app.Activity;
import android.view.View;
......@@ -14,8 +14,8 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.airbnb.lottie.LottieAnimationView;
import com.ym.bbnc.R;
import com.ym.game.monopoly.LollipopFixedWebView;
import com.zxhl.game.sqcy.R;
import com.zxhl.game.monopoly.LollipopFixedWebView;
import com.ym.library.activity.JavaInterface;
import com.ym.library.net.MyBaseActivity;
import com.ym.modulecommon.utils.LogUtils;
......
app/src/main/java/com/ym/game/activity/SplashActivity.kt → app/src/main/java/com/zxhl/game/activity/SplashActivity.kt
View file @ a2eb69ea
package com.ym.game.activity
package com.zxhl.game.activity
import android.content.Intent
import android.util.Log
......@@ -11,9 +11,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.bbnc.R
import com.ym.game.GameActivity
import com.ym.game.utils.CenterDialog
import com.zxhl.game.sqcy.R
import com.zxhl.game.GameActivity
import com.zxhl.game.utils.CenterDialog
import com.ym.library.MyConstant
import com.ym.library.module.ReportEntity
import com.ym.library.net.MyBaseActivity
......
app/src/main/java/com/ym/game/activity/WelfareActivityMy.kt → app/src/main/java/com/zxhl/game/activity/WelfareActivityMy.kt
View file @ a2eb69ea
package com.ym.game.activity
package com.zxhl.game.activity
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -7,13 +7,13 @@ import android.content.DialogInterface
import android.view.View
import android.view.animation.AnimationUtils
import androidx.recyclerview.widget.LinearLayoutManager
import com.ym.bbnc.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.zxhl.game.sqcy.R
import com.zxhl.game.adapter.WelfareDiamondAdapter
import com.zxhl.game.adapter.WelfareTaskAdpater
import com.zxhl.game.contract.WelfareContract
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.presenter.WelfarePresenter
import com.zxhl.game.view.MainDialog
import com.ym.library.listener.IAdVideoListener
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.*
......
app/src/main/java/com/ym/game/activity/WxLoginActivityMy.kt → app/src/main/java/com/zxhl/game/activity/WxLoginActivityMy.kt
View file @ a2eb69ea
package com.ym.game.activity
package com.zxhl.game.activity
import android.content.Intent
import android.view.View
import com.umeng.analytics.MobclickAgent
import com.ym.game.GameActivity
import com.zxhl.game.GameActivity
import com.ym.library.net.*
import com.ym.library.utils.*
import com.ym.library.utils.EventUtils.onEvent
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import kotlinx.android.synthetic.main.activity_wx_login.*
import org.jetbrains.anko.act
......@@ -109,6 +109,7 @@ class WxLoginActivityMy : MyBaseActivity(), WxImplUtils.IWxLoginCallback {
override fun onWxSuccess(token: String?, openid: String?) {
onEvent("login_wx", "登录成功")
onEvent("user_login", "用户微信登录")
startActivity(
Intent(this@WxLoginActivityMy, GameActivity::class.java)
)
......
app/src/main/java/com/ym/game/adapter/CardLayoutManager.java → app/src/main/java/com/zxhl/game/adapter/CardLayoutManager.java
View file @ a2eb69ea
package com.ym.game.adapter;
package com.zxhl.game.adapter;
import android.content.Context;
import android.util.AttributeSet;
......
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt → app/src/main/java/com/zxhl/game/adapter/CashExchangeAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.animation.AnimatorSet
import android.animation.ObjectAnimator
......@@ -15,9 +15,9 @@ import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.WithDrawEntity2
import com.ym.game.view.MainDialog
import com.zxhl.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.ExchangeEntity
import com.ym.library.net.BaseObserver
......@@ -78,7 +78,7 @@ class CashExchangeAdapter :
holder.item_duihuan?.setOnClickListener(object : NoDoubleClickListener() {
override fun onNoDoubleClick(view: View?) {
duihuan(bean.id, bean.type!!, bean.cashStr)
duihuan(bean.id, bean.type!!, bean.cashStr,bean.targetNum)
if (bean.type == 1) {
EventUtils.onEvent("click_xinshou0.3", "新手0.3")
} else if (bean.type == 4) {
......@@ -109,12 +109,14 @@ class CashExchangeAdapter :
}
}
fun duihuan(id: Int, type: Int, jine: String) {
fun duihuan(id: Int, type: Int, jine: String,targetId: Int) {
GameApiClient.gameApi.dowd(id).compose(
RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<ExchangeEntity>() {
override fun onSuccess(result: ExchangeEntity?) {
EventUtils.onEvent("withdraw_corn_${targetId}", "完成提现任务${targetId}个玉米")
// EventUtils.onEvent("click_yumi"+bean.id, "玉米" + bean.cash)
RxBusUtil.getDefault()
.send(RxBusConstant.RX_WITH_DRAW_LIST)
if (result != null) {
......
app/src/main/java/com/ym/game/adapter/ClockInWithdrawAdpater.kt → app/src/main/java/com/zxhl/game/adapter/ClockInWithdrawAdpater.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -12,7 +12,7 @@ import android.widget.*
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.utils.Utils
......
app/src/main/java/com/zxhl/game/adapter/PassWithdrawAdapter.kt 0 → 100644
View file @ a2eb69ea
package com.zxhl.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
import android.app.Activity
import android.text.Html
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.*
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.PassWithdrawEntity
import com.zxhl.game.sqcy.R
/**
*Craeted by ${junqi.li}
*Craeted by 2020/9/18
*/
class PassWithdrawAdapter :
BaseRecyclerAdapter<PassWithdrawEntity.ClockInItemEntity, PassWithdrawAdapter.PassWithdrawHolder> {
private var mContext: Activity? = null
private val listener: OnRecycleItemClickListener<PassWithdrawEntity.ClockInItemEntity>
constructor(
content: Activity?,
listener: OnRecycleItemClickListener<PassWithdrawEntity.ClockInItemEntity>
) : super() {
this.listener = listener
mContext = content
}
override fun getItemCount(): Int {
return mList.size
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PassWithdrawHolder {
return PassWithdrawHolder(
LayoutInflater.from(mContext).inflate(R.layout.item_pass_withdraw, parent, false)
)
}
override fun onBindViewHolder(holder: PassWithdrawHolder, position: Int) {
if (mList.size > 0) {
val data = mList[position]
holder?.tvMoney.text = "${data.cashStr}元"
holder?.progressBar.max = data.needClockNum ?: 0
holder?.progressBar.progress = data.currentNum ?: 0
holder?.tvProgress.text = "${data.currentNum}/${data.needClockNum}"
// holder?.tvDayNum.text = Html.fromHtml("还差${data?.targetNum}可提现 <font color=\"#FF304C\">${data.cashStr}元</font>")
holder?.tvDayNum.text = "${data.needClockNum}日打卡提现"
//0 不可提现 1 已提现 2可提现
if (data?.status == 1) {
holder.btnStatus.text = "已提现"
holder.btnStatus.setBackgroundResource(R.drawable.shape_daka_item_border_gray)
holder?.tvLack.text = Html.fromHtml("<font color=\"#999999\">已提现</font>")
} else {
holder.btnStatus.text = "提现"
holder.btnStatus.setBackgroundResource(R.drawable.shape_daka_item_border)
if (data?.currentNum!! >= data?.targetNum!!) {
holder?.tvLack.text =
Html.fromHtml("<font color=\"#FF304C\">已完成，可提现</font>")
} else {
if (data?.needClockNum?.minus(data?.currentNum!!) <= 0) {
holder?.tvLack.text =
Html.fromHtml(
"可提现<font color=\"#FD780D\">${data.cashStr}元</font>"
)
} else {
holder?.tvLack.text =
Html.fromHtml(
"还差 <font color=\"#FD780D\">" + "${
data?.needClockNum?.minus(
data?.currentNum!!
)
}天</font>可提现<font color=\"#FD780D\">${data.cashStr}元</font>"
)
}
}
}
holder.btnStatus?.setOnClickListener {
// JumpUtils.jumpWithdrawalsActivity()
listener.onItemClick(it, position, mList[position])
}
}
}
inner class PassWithdrawHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
var tvDayNum = itemView?.findViewById<TextView>(R.id.tv_clock_in_item_day)
var tvMoney = itemView?.findViewById<TextView>(R.id.tv_clock_in_item_money)
var progressBar = itemView?.findViewById<ProgressBar>(R.id.progress_clock_in_bar)
var tvProgress = itemView?.findViewById<TextView>(R.id.tv_clock_in_item_progress)
var tvLack = itemView?.findViewById<TextView>(R.id.tv_clock_in_item_lack)
var btnStatus = itemView?.findViewById<TextView>(R.id.btn_clock_in_status)
}
private fun startAnimator(imageView: View) {
val oa: ObjectAnimator = ObjectAnimator.ofFloat(
imageView,
View.ROTATION,
0F, 30F, -25F, 0F, 0F, 0F, 0F, 0F, 0F
)
oa.repeatCount = ValueAnimator.INFINITE
oa.setDuration(2000).start()
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/adapter/PuzzleBottomAdapter.kt → app/src/main/java/com/zxhl/game/adapter/PuzzleBottomAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.PuzzleEntity
import com.ym.modulecommon.AppliContext
......
app/src/main/java/com/ym/game/adapter/PuzzleTopAdapter.kt → app/src/main/java/com/zxhl/game/adapter/PuzzleTopAdapter.kt
View file @ a2eb69ea
......@@ -5,7 +5,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.PuzzleEntity
import com.ym.modulecommon.AppliContext
import com.ym.modulecommon.base.BaseRecyclerAdapter
......
app/src/main/java/com/ym/game/adapter/RecordAdapter.kt → app/src/main/java/com/zxhl/game/adapter/RecordAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.content.Context
import android.view.LayoutInflater
......@@ -6,7 +6,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.modulecommon.AppliContext
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.WdHistoryEntity
......
app/src/main/java/com/ym/game/adapter/SeedStoreAdapter.kt → app/src/main/java/com/zxhl/game/adapter/SeedStoreAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.annotation.SuppressLint
import android.app.Activity
......@@ -10,9 +10,9 @@ 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.zxhl.game.sqcy.R
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.AddPropEntity
......
app/src/main/java/com/ym/game/adapter/SigninDropsAdapter.kt → app/src/main/java/com/zxhl/game/adapter/SigninDropsAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.content.Context
import android.util.Log
......@@ -9,7 +9,7 @@ import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.SinginEntity
/**
......
app/src/main/java/com/ym/game/adapter/SpeedWaterTaskAdapter.kt → app/src/main/java/com/zxhl/game/adapter/SpeedWaterTaskAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -11,7 +11,7 @@ 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.zxhl.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.net.BaseObserver
import com.ym.library.net.RxSchedulers
......@@ -19,7 +19,7 @@ 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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskCompleteEntity
import com.ym.library.module.WateringTaskEntity
......
app/src/main/java/com/ym/game/adapter/WareHouseAdapter.kt → app/src/main/java/com/zxhl/game/adapter/WareHouseAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.content.Context
import android.view.LayoutInflater
......@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.module.FlyBoxEntity
import com.ym.modulecommon.AppliContext
......
app/src/main/java/com/ym/game/adapter/WateringTaskAdpater.kt → app/src/main/java/com/zxhl/game/adapter/WateringTaskAdpater.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -9,7 +9,7 @@ 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.zxhl.game.view.MainDialog
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.net.BaseObserver
import com.ym.library.net.RxSchedulers
......@@ -17,7 +17,7 @@ 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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskCompleteEntity
import com.ym.library.module.WateringTaskEntity
......@@ -172,7 +172,7 @@ class WateringTaskAdpater :
// 领取水滴 type:1每日领水 2高额领水
fun getDripTaskReceive(type: Int, sid:Int) {
GameApiClient.gameApi.getTaskComplete2(sid,"speed_task_list").compose(
GameApiClient.gameApi.getTaskComplete2(sid,"cy_speed_task_list").compose(
RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<TaskCompleteEntity>() {
override fun onSuccess(result: TaskCompleteEntity?) {
......
app/src/main/java/com/ym/game/adapter/WelfareDiamondAdapter.kt → app/src/main/java/com/zxhl/game/adapter/WelfareDiamondAdapter.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -8,7 +8,7 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.library.module.DiamondEntity
......
app/src/main/java/com/ym/game/adapter/WelfareTaskAdpater.kt → app/src/main/java/com/zxhl/game/adapter/WelfareTaskAdpater.kt
View file @ a2eb69ea
package com.ym.game.adapter
package com.zxhl.game.adapter
import android.animation.ObjectAnimator
import android.animation.ValueAnimator
......@@ -14,7 +14,7 @@ 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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.module.NewsEntity
/**
......
app/src/main/java/com/ym/game/application/BaseApplication.kt → app/src/main/java/com/zxhl/game/application/BaseApplication.kt
View file @ a2eb69ea
package com.ym.game.application;
package com.zxhl.game.application;
import android.app.Activity
......@@ -71,10 +71,10 @@ class BaseApplication : BaseApplication() {
AppLibraryConfig.ActivityConfig.isProhibitScreenshot=false
//AppLibraryConfig.NetConfig.isDebug = isDebug
// Constant.appLs = "afcbef40e31631d3"//appls
AdManager.init(this, "7025878009b4cca3")
AdManager.init(this, "53a1b390e9b29cf1")
UMConfigure.setLogEnabled(false)
UMConfigure.init(this, "5fe446a944bb94418a636569", "", UMConfigure.DEVICE_TYPE_PHONE, "")
UMConfigure.init(this, "5fec91e5adb42d5826964a7c", "", UMConfigure.DEVICE_TYPE_PHONE, "")
PlatformConfig.setWeixin(MyConstant.WX_APPID, MyConstant.WX_APPKEY)
......@@ -89,7 +89,7 @@ class BaseApplication : BaseApplication() {
// 设置是否为上报进程
strategy.isUploadProcess = processName == null || processName == packageName
//Bugly初始化
CrashReport.initCrashReport(this, "3bac59d22f", BuildConfig.DEBUG, strategy)
CrashReport.initCrashReport(this, "8c0f4a2cab", BuildConfig.DEBUG, strategy)
//========== Bugly ==========
//小满
......
app/src/main/java/com/ym/game/contract/CashExchangeContract.kt → app/src/main/java/com/zxhl/game/contract/CashExchangeContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.WithDrawEntity2
......
app/src/main/java/com/ym/game/contract/ClockInWithdrawContract.kt → app/src/main/java/com/zxhl/game/contract/ClockInWithdrawContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.module.ExchangeEntity
import com.ym.library.module.PassWithdrawEntity
class ClockInWithdrawContract {
interface View {
fun clockInWithdrawListResult(result: ClockInWithdrawEntity?)
fun dowdResult(result: ExchangeEntity?)
fun clockInWithdrawListResult(result: PassWithdrawEntity?)
fun dowdResult(result: ExchangeEntity?,num:Int)
}
interface Presenter {
fun getClockInWithdrawList()
fun getDoWd(id: Int)
fun getDoWd(id: Int,num:Int)
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/contract/PuzzleContract.kt → app/src/main/java/com/zxhl/game/contract/PuzzleContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.PuzzleEntity
......
app/src/main/java/com/ym/game/contract/RecordContract.kt → app/src/main/java/com/zxhl/game/contract/RecordContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.WdHistoryEntity
......
app/src/main/java/com/ym/game/contract/SeedStoreContract.kt → app/src/main/java/com/zxhl/game/contract/SeedStoreContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.SeedListEntity
......
app/src/main/java/com/ym/game/contract/SpeedWaterContract.kt → app/src/main/java/com/zxhl/game/contract/SpeedWaterContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.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/zxhl/game/contract/TurntableContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.TurntableEntity
......
app/src/main/java/com/ym/game/contract/WareHouseContract.kt → app/src/main/java/com/zxhl/game/contract/WareHouseContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.WateringTaskEntity
......
app/src/main/java/com/ym/game/contract/WateringRewardContract.kt → app/src/main/java/com/zxhl/game/contract/WateringRewardContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.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/zxhl/game/contract/WelfareContract.kt
View file @ a2eb69ea
package com.ym.game.contract
package com.zxhl.game.contract
import com.ym.library.module.*
......
app/src/main/java/com/ym/game/monopoly/LollipopFixedWebView.java → app/src/main/java/com/zxhl/game/monopoly/LollipopFixedWebView.java
View file @ a2eb69ea
package com.ym.game.monopoly;
package com.zxhl.game.monopoly;
import android.annotation.TargetApi;
import android.content.Context;
......
app/src/main/java/com/ym/game/netstate/NetStateChangeReceiver.java → app/src/main/java/com/zxhl/game/netstate/NetStateChangeReceiver.java
View file @ a2eb69ea
package com.ym.game.netstate;
package com.zxhl.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/zxhl/game/netstate/NetworkType.java
View file @ a2eb69ea
package com.ym.game.netstate;
package com.zxhl.game.netstate;
/**
* @author (wangXuewei)
......
app/src/main/java/com/ym/game/netstate/NetworkUtil.java → app/src/main/java/com/zxhl/game/netstate/NetworkUtil.java
View file @ a2eb69ea
package com.ym.game.netstate;
package com.zxhl.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/zxhl/game/notif/NotificationService.java
View file @ a2eb69ea
package com.ym.game.notif;
package com.zxhl.game.notif;
import android.annotation.SuppressLint;
import android.app.Activity;
......@@ -18,9 +18,10 @@ import android.widget.RemoteViews;
import androidx.core.app.NotificationCompat;
import com.ym.bbnc.R;
import com.ym.game.GameActivity;
import com.zxhl.game.sqcy.R;
import com.zxhl.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/zxhl/game/presenter/CashExchangePresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.CashExchangeContract
import com.zxhl.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/zxhl/game/presenter/ClockInWithdrawPresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.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.zxhl.game.contract.ClockInWithdrawContract
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.view.MainDialog
import com.ym.library.module.ClockInWithdrawEntity
import com.ym.library.module.ExchangeEntity
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.PassWithdrawEntity
import com.ym.library.net.BaseObserver
import com.ym.library.net.GameApiClient
import com.ym.library.net.RxSchedulers
......@@ -24,8 +25,8 @@ class ClockInWithdrawPresenter : ClockInWithdrawContract.Presenter {
override fun getClockInWithdrawList() {
GameApiClient.gameApi.getClockList().compose(
RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<ClockInWithdrawEntity>() {
override fun onSuccess(result: ClockInWithdrawEntity?) {
).subscribe(object : BaseObserver<PassWithdrawEntity>() {
override fun onSuccess(result: PassWithdrawEntity?) {
mView?.clockInWithdrawListResult(result)
}
......@@ -35,16 +36,17 @@ class ClockInWithdrawPresenter : ClockInWithdrawContract.Presenter {
})
}
override fun getDoWd(id:Int) {
override fun getDoWd(id: Int, num: Int) {
GameApiClient.gameApi.getDoWd(id).compose(
RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<ExchangeEntity>() {
override fun onSuccess(result: ExchangeEntity?) {
mView?.dowdResult(result)
mView?.dowdResult(result,num)
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
mView?.dowdResult(null)
mView?.dowdResult(null,num)
}
})
}
......
app/src/main/java/com/ym/game/presenter/PuzzlePresenter.kt → app/src/main/java/com/zxhl/game/presenter/PuzzlePresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import android.app.Activity
import android.util.Log
import android.view.View
import com.ym.game.contract.PuzzleContract
import com.zxhl.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/zxhl/game/presenter/RecordPresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.RecordContract
import com.zxhl.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/SeedStorePresenter.kt → app/src/main/java/com/zxhl/game/presenter/SeedStorePresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.SeedStoreContract
import com.ym.game.contract.WareHouseContract
import com.zxhl.game.contract.SeedStoreContract
import com.zxhl.game.contract.WareHouseContract
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.SeedListEntity
import com.ym.library.net.BaseObserver
......
app/src/main/java/com/ym/game/presenter/SpeedWaterPresenter.kt → app/src/main/java/com/zxhl/game/presenter/SpeedWaterPresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.SpeedWaterContract
import com.zxhl.game.contract.SpeedWaterContract
import com.ym.library.module.NewsEntity
import com.ym.library.module.TaskListEntity
import com.ym.library.module.WateringTaskEntity
......
app/src/main/java/com/ym/game/presenter/TurntablePresenter.kt → app/src/main/java/com/zxhl/game/presenter/TurntablePresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.TurntableContract
import com.zxhl.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/zxhl/game/presenter/WareHousePresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.WareHouseContract
import com.zxhl.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/zxhl/game/presenter/WateringRewardPresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.ym.game.contract.WateringRewardContract
import com.zxhl.game.contract.WateringRewardContract
import com.ym.library.module.NewsEntity
import com.ym.library.module.SinginEntity
import com.ym.library.module.TaskListEntity
......@@ -35,7 +35,7 @@ class WateringRewardPresenter : WateringRewardContract.Presenter {
//
// override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {}
// })
GameApiClient.gameApi.getTaskListInfo("speed_task_list").compose(
GameApiClient.gameApi.getTaskListInfo("cy_speed_task_list").compose(
RxSchedulers.observableIO2Main()
).subscribe(object : BaseObserver<TaskListEntity>() {
override fun onSuccess(result: TaskListEntity?) {
......
app/src/main/java/com/ym/game/presenter/WelfarePresenter.kt → app/src/main/java/com/zxhl/game/presenter/WelfarePresenter.kt
View file @ a2eb69ea
package com.ym.game.presenter
package com.zxhl.game.presenter
import com.tencent.ep.commonbase.api.AppContext
import com.ym.game.contract.WelfareContract
import com.zxhl.game.contract.WelfareContract
import com.ym.library.module.*
import com.ym.library.net.ApiClient
import com.ym.library.net.BaseObserver
......
app/src/main/java/com/ym/bbnc/wxapi/WXEntryActivity.java → app/src/main/java/com/zxhl/game/sqcy/wxapi/WXEntryActivity.java
View file @ a2eb69ea
package com.ym.bbnc.wxapi;
package com.zxhl.game.sqcy.wxapi;
import com.umeng.socialize.weixin.view.WXCallbackActivity;
......
app/src/main/java/com/ym/game/utils/CenterDialog.kt → app/src/main/java/com/zxhl/game/utils/CenterDialog.kt
View file @ a2eb69ea
package com.ym.game.utils
package com.zxhl.game.utils
import android.app.Activity
import android.app.Dialog
......@@ -11,7 +11,7 @@ import android.text.style.ForegroundColorSpan
import android.view.Gravity
import android.view.View
import android.widget.TextView
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.base.BaseDialog
import com.ym.library.net.NetConfig
import com.ym.library.utils.JumpUtils
......@@ -73,7 +73,7 @@ object CenterDialog:BaseDialog() {
desc.setMovementMethod(LinkMovementMethod.getInstance());
val str = "欢迎使用芭芭农场！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
val str = "欢迎使用神奇菜园！为了更好的保护您的隐私和个人信息安全，根据国家相关法律规定和标准更新了"
val ss = SpannableStringBuilder("查看完整《用户协议》和《隐私政策》，请您在使用前仔细阅读并了解。")
ss.setSpan(
......
app/src/main/java/com/ym/game/view/CashExchangeDialog.kt → app/src/main/java/com/zxhl/game/view/CashExchangeDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.annotation.SuppressLint
import android.app.Activity
......@@ -8,16 +8,16 @@ 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.zxhl.game.adapter.CashExchangeAdapter
import com.zxhl.game.contract.CashExchangeContract
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.ym.library.module.WithDrawEntity2
import com.ym.game.presenter.CashExchangePresenter
import com.zxhl.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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.utils.EventUtils
object CashExchangeDialog : CashExchangeContract.View {
......
app/src/main/java/com/ym/game/view/ExchangeRecordDialog.kt → app/src/main/java/com/zxhl/game/view/ExchangeRecordDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.app.Dialog
import android.content.Context
......@@ -6,10 +6,10 @@ import android.view.Gravity
import android.widget.ImageView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.R
import com.ym.game.adapter.RecordAdapter
import com.ym.game.contract.RecordContract
import com.ym.game.presenter.RecordPresenter
import com.zxhl.game.sqcy.R
import com.zxhl.game.adapter.RecordAdapter
import com.zxhl.game.contract.RecordContract
import com.zxhl.game.presenter.RecordPresenter
import com.ym.library.module.WdHistoryEntity
import com.ym.library.rxbus.RxBusUtil
......
app/src/main/java/com/ym/game/view/MainDialog.kt → app/src/main/java/com/zxhl/game/view/MainDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.app.Activity
import android.app.Dialog
......@@ -10,9 +10,9 @@ import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.*
import com.ym.game.listener.IDialogViewCloseCallback
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.ym.modulecommon.AppliContext
import com.ym.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.MyConstant
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.TurntableEntity
......
app/src/main/java/com/ym/game/view/PuzzleDialog.kt → app/src/main/java/com/zxhl/game/view/PuzzleDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.animation.Animator
......@@ -23,16 +23,16 @@ import android.widget.RelativeLayout
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.airbnb.lottie.LottieAnimationView
import com.ym.bbnc.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.zxhl.game.sqcy.R
import com.zxhl.game.contract.PuzzleContract
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.presenter.PuzzlePresenter
import com.zxhl.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.game.adapter.PuzzleBottomAdapter
import com.zxhl.game.adapter.PuzzleBottomAdapter
import com.ym.library.listener.IAdVideoListener
import com.ym.library.utils.AdUtils
import com.ym.library.utils.EventUtils
......
app/src/main/java/com/ym/game/view/SeedStoreDialog.kt → app/src/main/java/com/zxhl/game/view/SeedStoreDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.annotation.SuppressLint
import android.app.Dialog
......@@ -7,10 +7,10 @@ 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.zxhl.game.sqcy.R
import com.zxhl.game.adapter.SeedStoreAdapter
import com.zxhl.game.contract.SeedStoreContract
import com.zxhl.game.presenter.SeedStorePresenter
import com.ym.library.module.SeedListEntity
import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil
......
app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt → app/src/main/java/com/zxhl/game/view/SiginDropsPopupwindow.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.annotation.SuppressLint
import android.app.Activity
......@@ -11,16 +11,16 @@ import android.widget.TextView
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.library.listener.OnRecycleItemClickListener
import com.ym.game.listener.IDialogViewCloseCallback
import com.ym.game.adapter.SigninDropsAdapter
import com.ym.game.adapter.WateringTaskAdpater
import com.ym.game.contract.WateringRewardContract
import com.ym.game.presenter.WateringRewardPresenter
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.adapter.SigninDropsAdapter
import com.zxhl.game.adapter.WateringTaskAdpater
import com.zxhl.game.contract.WateringRewardContract
import com.zxhl.game.presenter.WateringRewardPresenter
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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.*
import com.ym.library.utils.*
......@@ -107,10 +107,10 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.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()
......
app/src/main/java/com/ym/game/view/SpeedWaterPopupWindow.kt → app/src/main/java/com/zxhl/game/view/SpeedWaterPopupWindow.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.annotation.SuppressLint
import android.app.Activity
......@@ -10,16 +10,16 @@ import android.widget.RelativeLayout
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
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.zxhl.game.adapter.SpeedWaterTaskAdapter
import com.zxhl.game.contract.SpeedWaterContract
import com.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.presenter.SpeedWaterPresenter
import com.ym.library.module.NewsEntity
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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.TaskListEntity
import com.ym.library.module.WateringTaskEntity
......@@ -81,10 +81,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()
......
app/src/main/java/com/ym/game/view/TurntableDialog.kt → app/src/main/java/com/zxhl/game/view/TurntableDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.annotation.SuppressLint
import android.app.Activity
......@@ -13,16 +13,16 @@ 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.zxhl.game.listener.IDialogViewCloseCallback
import com.zxhl.game.contract.TurntableContract
import com.zxhl.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.bbnc.R
import com.zxhl.game.sqcy.R
import com.ym.library.listener.IAdVideoListener
import com.ym.library.module.StatusEntity
import com.ym.library.module.TurntableEntity
......
app/src/main/java/com/ym/game/view/TurntableUtils.kt → app/src/main/java/com/zxhl/game/view/TurntableUtils.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.animation.Animator
import android.animation.AnimatorSet
......@@ -6,8 +6,8 @@ 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.library.utils.LogUtils
import com.zxhl.game.listener.CustomAnimatiorListener
/**
*Craeted by ${junqi.li}
......
app/src/main/java/com/ym/game/view/WareHouseDialog.kt → app/src/main/java/com/zxhl/game/view/WareHouseDialog.kt
View file @ a2eb69ea
package com.ym.game.view
package com.zxhl.game.view
import android.app.Dialog
import android.content.Context
......@@ -7,12 +7,12 @@ import android.widget.ImageView
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.bbnc.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.zxhl.game.sqcy.R
import com.zxhl.game.adapter.RecordAdapter
import com.zxhl.game.adapter.WareHouseAdapter
import com.zxhl.game.contract.WareHouseContract
import com.zxhl.game.presenter.RecordPresenter
import com.zxhl.game.presenter.WareHousePresenter
import com.ym.library.module.FlyBoxEntity
import com.ym.library.module.WateringTaskEntity
import com.ym.library.rxbus.RxBusUtil
......
app/src/main/java/com/ym/game/wedget/FontTextView.java → app/src/main/java/com/zxhl/game/wedget/FontTextView.java
View file @ a2eb69ea
package com.ym.game.wedget;
package com.zxhl.game.wedget;
import android.content.Context;
import android.graphics.Typeface;
......
app/src/main/java/com/ym/game/wedget/MediumBoldTextView.java → app/src/main/java/com/zxhl/game/wedget/MediumBoldTextView.java
View file @ a2eb69ea
package com.ym.game.wedget;
package com.zxhl.game.wedget;
import android.content.Context;
import android.graphics.Canvas;
......
app/src/main/res/drawable/game_clock_in_item_progress_bg2.xml 0 → 100644
View file @ a2eb69ea
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="7.5dp" />
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="#EEEEEE" />-->
<solid android:color="#EEEEEE" />
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="7.5dp" />
<gradient
android:angle="0"
android:endColor="#E65F0F"
android:startColor="#E65F0F" />
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/game_clock_in_progress_bg3.xml 0 → 100644
View file @ a2eb69ea
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:radius="9dp" />
<!-- <stroke-->
<!-- android:width="1dp"-->
<!-- android:color="#EEEEEE" />-->
<solid android:color="#DC9334" />
</shape>
</item>
<item android:id="@android:id/progress">
<clip>
<shape>
<corners android:radius="9dp" />
<gradient
android:angle="0"
android:endColor="#994B01"
android:startColor="#994B01" />
</shape>
</clip>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/layout_border.xml 0 → 100644
View file @ a2eb69ea
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FEE8C5" />
<corners
android:bottomLeftRadius="8dp"
android:bottomRightRadius="8dp"
android:topLeftRadius="8dp"
android:topRightRadius="8dp" />
<stroke
android:width="2dp"
android:color="#DC9334" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_daka_item_border.xml 0 → 100644
View file @ a2eb69ea
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#E65F0F"/>
<corners android:radius="21dp"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_daka_item_border_gray.xml 0 → 100644
View file @ a2eb69ea
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#eeeeee"/>
<corners android:radius="21dp"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_clock_in_withdraw.xml
View file @ a2eb69ea
......@@ -3,14 +3,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#F7BD7C"
android:background="#DC9334"
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:background="#DC9334"
android:gravity="center_vertical">
<ImageView
android:id="@+id/iv_clock_in_close"
......@@ -18,22 +19,29 @@
android:layout_height="match_parent"
android:paddingLeft="12dp"
android:paddingRight="12dp"
android:src="@drawable/icon_clock_in_close" />
android:src="@mipmap/sqcy_daka_back_icon" />
<com.ym.game.wedget.MediumBoldTextView
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="打卡提现"
android:textColor="#7E320A"
android:textSize="20sp"
android:textStyle="bold" />
android:src="@mipmap/sqcy_daka_title" />
<!-- <com.zxhl.game.wedget.MediumBoldTextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:text="打卡提现"-->
<!-- android:textColor="#7E320A"-->
<!-- android:textSize="20sp"-->
<!-- android:textStyle="bold" />-->
</RelativeLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent"
android:background="#FFF8D9">
<LinearLayout
android:layout_width="match_parent"
......@@ -41,26 +49,100 @@
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_clock_in_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="#ED7624"
android:textSize="26sp"
android:textStyle="bold"
tools:text="已连续打卡 天" />
<TextView
android:id="@+id/tv_clock_in_info"
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:includeFontPadding="false"
android:textColor="#8F2C0F"
android:textSize="16sp"
tools:text="每日观看20个视频即可完成打卡" />
android:layout_margin="@dimen/dp_12"
android:background="@drawable/layout_border"
android:paddingLeft="@dimen/dp_14"
android:paddingTop="@dimen/dp_12"
android:paddingRight="@dimen/dp_14"
android:paddingBottom="@dimen/dp_20">
<TextView
android:id="@+id/tv_clock_in_days"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_19"
android:includeFontPadding="false"
android:textColor="#994B01"
android:textSize="26sp"
android:textStyle="bold"
tools:text="已连续打卡 天" />
<ImageView
android:id="@+id/img_sqcy_video_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_clock_in_days"
android:layout_marginRight="8dp"
android:paddingRight="@dimen/dp_5"
android:src="@mipmap/sqcy_daka_video_icon" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignRight="@id/img_sqcy_video_icon"
android:layout_alignBottom="@id/img_sqcy_video_icon"
android:src="@mipmap/sqcy_daka_little_icon" />
<TextView
android:id="@+id/tv_clock_in_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_clock_in_days"
android:layout_toRightOf="@id/img_sqcy_video_icon"
android:includeFontPadding="false"
android:textColor="#663408"
android:textSize="16sp"
android:text="今日打卡进度" />
<TextView
android:id="@+id/tv_clock_in_desc_video"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_clock_in_days"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_30"
android:background="@mipmap/sqcy_daka_title_tv_bg"
android:gravity="center"
android:paddingBottom="@dimen/dp_5"
android:text="还需要看10个视频"
android:textColor="@color/white"
android:textSize="11sp" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/tv_clock_in_desc_video"
android:layout_toRightOf="@id/img_sqcy_video_icon">
<ProgressBar
android:id="@+id/progress_clock_in_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_14"
android:max="100"
android:progress="30"
android:progressDrawable="@drawable/game_clock_in_progress_bg3" />
<com.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_clock_in_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="-1dp"
android:includeFontPadding="false"
android:text="1/10"
android:textColor="@color/white"
android:textSize="12sp" />
</RelativeLayout>
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_clock_in"
......
app/src/main/res/layout/activity_monopoly_webview.xml
View file @ a2eb69ea
......@@ -53,7 +53,7 @@
android:layout_height="3dp"
android:background="@color/white" />
<com.ym.game.monopoly.LollipopFixedWebView
<com.zxhl.game.monopoly.LollipopFixedWebView
android:id="@+id/activity_webview"
android:layout_width="match_parent"
android:layout_height="match_parent"
......
app/src/main/res/layout/activity_welfare.xml
View file @ a2eb69ea
......@@ -23,7 +23,7 @@
android:paddingBottom="12dp"
android:src="@drawable/arrow_left" />
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.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.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_welfare_diamond_conut"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......
app/src/main/res/layout/dialog_layout_drop_or_warm.xml
View file @ a2eb69ea
......@@ -67,10 +67,11 @@
android:id="@+id/img_get"
android:layout_width="228dp"
android:layout_height="51dp"
android:visibility="gone"
android:layout_centerHorizontal="true"
android:layout_marginTop="262.5dp" />
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_shengxu_num"
android:layout_width="wrap_content"
android:layout_height="26dp"
......@@ -78,6 +79,7 @@
android:layout_centerHorizontal="true"
android:gravity="center"
android:includeFontPadding="false"
android:visibility="gone"
android:text="今天剩余x次"
android:textColor="#864F1C"
android:textSize="10sp" />
......
app/src/main/res/layout/dialog_layout_get_box.xml
View file @ a2eb69ea
......@@ -135,7 +135,7 @@
android:layout_marginTop="262.5dp"
android:src="@drawable/select_get_box" />
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_get_box_num"
android:layout_width="wrap_content"
android:layout_height="27dp"
......
app/src/main/res/layout/dialog_layout_with_draw_success.xml
View file @ a2eb69ea
......@@ -54,7 +54,6 @@
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="150dp"
android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true"
android:layout_marginLeft="28dp"
android:layout_marginTop="@dimen/dp_121"
......
app/src/main/res/layout/dialog_privacy_protocol_view.xml
View file @ a2eb69ea
......@@ -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 @ a2eb69ea
......@@ -5,7 +5,7 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp">
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.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 @ a2eb69ea
......@@ -47,7 +47,7 @@
android:gravity="center_vertical"
android:orientation="vertical">
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_ad_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -58,7 +58,7 @@
android:textColor="#E91119"
android:textSize="18sp" />
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.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.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -126,7 +126,7 @@
android:layout_marginTop="-8dp"
android:src="@drawable/icon_clock_in_item_red_pg_coin_complete" />
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_money_red"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -146,7 +146,7 @@
android:layout_marginRight="20dp"
android:visibility="visible">
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.MediumBoldTextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="3dp"
......
app/src/main/res/layout/item_pass_withdraw.xml 0 → 100644
View file @ a2eb69ea
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="90dp"
android:layout_marginBottom="8dp"
android:background="@color/white">
<RelativeLayout
android:id="@+id/layout_clock_in_item_left"
android:layout_width="45dp"
android:layout_height="54dp"
android:layout_centerVertical="true"
android:layout_marginLeft="14dp"
android:layout_marginRight="12dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/sqcy_daka_red_pack" />
<TextView
android:id="@+id/tv_clock_in_item_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="14sp"
android:textStyle="bold"
tools:text="111" />
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/layout_clock_in_item_left"
android:orientation="vertical">
<TextView
android:id="@+id/tv_clock_in_item_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="#00297A"
android:textSize="16sp"
tools:text="3日打卡提现" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="10dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="10dp">
<ProgressBar
android:id="@+id/progress_clock_in_bar"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="160dp"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:max="100"
android:progress="30"
android:progressDrawable="@drawable/game_clock_in_item_progress_bg2" />
<com.zxhl.game.wedget.MediumBoldTextView
android:id="@+id/tv_clock_in_item_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginTop="-1dp"
android:includeFontPadding="false"
android:text="1/10"
android:textColor="@color/white"
android:textSize="9sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_clock_in_item_lack"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="#999999"
android:textSize="12sp"
tools:text="还差5天可提现" />
</LinearLayout>
<TextView
android:id="@+id/btn_clock_in_status"
android:layout_width="79dp"
android:layout_height="30dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="14dp"
android:background="@drawable/shape_daka_item_border"
android:gravity="center"
android:textColor="#FFF7DC"
android:textSize="14sp"
android:textStyle="bold"
tools:text="提现" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/item_welfare_task.xml
View file @ a2eb69ea
......@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical">
<com.ym.game.wedget.MediumBoldTextView
<com.zxhl.game.wedget.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 @ a2eb69ea
<resources>
<string name="app_name">芭芭农场</string>
<string name="app_name">神奇菜园</string>
</resources>
app/version.properties
View file @ a2eb69ea
PACKAGE_NAME=com.ym.bbnc
VERSION_CODE=14
VERSION_NAME=1.2.1
\ No newline at end of file
PACKAGE_NAME=com.zxhl.game.sqcy
VERSION_CODE=15
VERSION_NAME=1.2.0
\ No newline at end of file
game/src/main/assets/bin/Data/level0
View file @ a2eb69ea
This diff is collapsed.
game/src/main/assets/bin/Data/level1
View file @ a2eb69ea
This diff is collapsed.
library/src/main/AndroidManifest.xml
View file @ a2eb69ea
This diff is collapsed.
library/src/main/res/values/strings.xml
View file @ a2eb69ea
This diff is collapsed.
userinfo/src/main/AndroidManifest.xml
View file @ a2eb69ea
This diff is collapsed.
userinfo/src/main/res/values/strings.xml
View file @ a2eb69ea
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