Skip to content

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

111222222

parent 1124a0f5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 306 additions and 944 deletions
app/build.gradle
View file @ c89d46de
...@@ -102,7 +102,6 @@ android { ...@@ -102,7 +102,6 @@ android {
meizu {} meizu {}
yyb {} yyb {}
sougou {} sougou {}
toutiao {}
hykb{} hykb{}
kuaishou{} kuaishou{}
} }
......
app/src/main/java/com/ym/game/GameActivity.kt
View file @ c89d46de
...@@ -52,8 +52,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -52,8 +52,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
mRefreshLoginObservable = RxBus.get().register("refresh_login", Boolean::class.java) mRefreshLoginObservable = RxBus.get().register("refresh_login", Boolean::class.java)
TurntableDialog.initTurntableAnim() TurntableDialog.initTurntableAnim()
getUserInfo() getUserInfo()
//getRankReceive() checkUpdateApp()
checkUpdateApp()
mRefreshLoginObservable?.observeOn(AndroidSchedulers.mainThread())?.subscribe({ mRefreshLoginObservable?.observeOn(AndroidSchedulers.mainThread())?.subscribe({
SettingPreference.setToken("") SettingPreference.setToken("")
try { try {
...@@ -546,10 +545,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -546,10 +545,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
fun jumpOrderDialog() { fun jumpOrderDialog() {
if (mOrderString != null && !mOrderString.equals("")) { if (mOrderString != null && !mOrderString.equals("")) {
MainDialog.showOrderDialog(
this@GameActivity,
mOrderString
)
} }
} }
...@@ -858,26 +854,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -858,26 +854,6 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
}) })
} }
fun getRankReceive() {
GameApiClient.gameApi.getRankReceive()
.compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<RankReceiveEntity>() {
override fun onSuccess(result: RankReceiveEntity?) {
if (result != null) {
if (result.awardCents > 0) {
MainDialog.showgetRankRedPackage(
this@GameActivity,
result.awardCents, result.rank,
this@GameActivity
)
}
}
}
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
}
})
}
fun GameEvent(keyName: String, valueName: String) { fun GameEvent(keyName: String, valueName: String) {
EventUtils.onEvent(keyName, valueName); EventUtils.onEvent(keyName, valueName);
......
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt
View file @ c89d46de
...@@ -48,7 +48,8 @@ class CashExchangeAdapter : ...@@ -48,7 +48,8 @@ class CashExchangeAdapter :
holder.item_mark?.visibility = View.GONE holder.item_mark?.visibility = View.GONE
} }
holder.item_icon?.let { setImage(it, bean.id) } holder.item_icon?.let { setImage(it, bean.id) }
holder.item_cash?.text = bean.cashStr + bean.unit holder.item_cash?.text = bean.cashStr
holder.item_unit?.text = bean.unit
holder.item_progress?.max = bean.targetNum!! holder.item_progress?.max = bean.targetNum!!
holder.item_progress?.setProgress(bean.completeNum!!) holder.item_progress?.setProgress(bean.completeNum!!)
holder.item_jindu?.text = "${bean.completeNum}/${bean.targetNum}" holder.item_jindu?.text = "${bean.completeNum}/${bean.targetNum}"
...@@ -127,6 +128,7 @@ class CashExchangeAdapter : ...@@ -127,6 +128,7 @@ class CashExchangeAdapter :
var item_chazhi: TextView? var item_chazhi: TextView?
var item_jindu: TextView? var item_jindu: TextView?
var item_cash: TextView? var item_cash: TextView?
var item_unit: TextView?
constructor( constructor(
itemView: View itemView: View
...@@ -134,6 +136,7 @@ class CashExchangeAdapter : ...@@ -134,6 +136,7 @@ class CashExchangeAdapter :
item_chazhi = itemView.findViewById<TextView>(R.id.id_tv_chazhi) item_chazhi = itemView.findViewById<TextView>(R.id.id_tv_chazhi)
item_jindu = itemView.findViewById<TextView>(R.id.id_tv_jindu) item_jindu = itemView.findViewById<TextView>(R.id.id_tv_jindu)
item_cash = itemView.findViewById<TextView>(R.id.id_tv_cash) item_cash = itemView.findViewById<TextView>(R.id.id_tv_cash)
item_unit = itemView.findViewById<TextView>(R.id.id_tv_unit)
item_icon = itemView.findViewById<ImageView>(R.id.id_img_icon) item_icon = itemView.findViewById<ImageView>(R.id.id_img_icon)
item_mark = itemView.findViewById<ImageView>(R.id.id_img_mark) item_mark = itemView.findViewById<ImageView>(R.id.id_img_mark)
item_duihuan = itemView.findViewById<ImageView>(R.id.id_img_duihuan) item_duihuan = itemView.findViewById<ImageView>(R.id.id_img_duihuan)
...@@ -144,7 +147,7 @@ class CashExchangeAdapter : ...@@ -144,7 +147,7 @@ class CashExchangeAdapter :
fun setImage(img: ImageView, id: Int) { fun setImage(img: ImageView, id: Int) {
when (id) { when (id) {
0 -> { 0 -> {
img.setImageResource(R.mipmap.icon_diamand) img.setImageResource(R.mipmap.ic_zuanshi)
} }
1 -> { 1 -> {
img.setImageResource(R.mipmap.baicai_fruit) img.setImageResource(R.mipmap.baicai_fruit)
...@@ -175,6 +178,7 @@ class CashExchangeAdapter : ...@@ -175,6 +178,7 @@ class CashExchangeAdapter :
} }
} }
} }
/** /**
* 添加点击缩放效果 * 添加点击缩放效果
*/ */
......
app/src/main/java/com/ym/game/adapter/GameOrderListAdapter.kt deleted 100644 → 0
View file @ 1124a0f5
package com.ym.game.adapter
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.ProgressBar
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import com.ym.game.module.OrderListEntity
import com.ym.library.AppliContext
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.ddcy.R
class GameOrderListAdapter :
BaseRecyclerAdapter<OrderListEntity.FarmOrderDataListBean, GameOrderListAdapter.ContentSignHolder>() {
override fun onBindViewHolder(holder: ContentSignHolder, position: Int) {
var orderBean = mList[position]
holder.item_img?.let { setImage(it,orderBean.id) }
holder.item_name?.text = orderBean.name
var currPos = orderBean.ownNum/orderBean.targetNum.toFloat()
holder.item_progress?.progress=(currPos * 100).toInt()
holder.item_desc?.text="${orderBean.ownNum}/${orderBean.targetNum}"
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ContentSignHolder {
return ContentSignHolder(
LayoutInflater.from(AppliContext.get())
.inflate(R.layout.item_game_order_list, parent, false)
)
}
class ContentSignHolder : RecyclerView.ViewHolder {
var item_name: TextView?
var item_desc: TextView?
var item_img: ImageView?
var item_progress: ProgressBar?
constructor(
itemView: View
) : super(itemView) {
item_name = itemView.findViewById<TextView>(R.id.id_item_game_order_name)
item_desc = itemView.findViewById<TextView>(R.id.id_item_game_order_desc)
item_img = itemView.findViewById<ImageView>(R.id.id_item_game_order_img)
item_progress = itemView.findViewById<ProgressBar>(R.id.id_item_game_order_progress)
}
}
fun setImage(img: ImageView, id: Int) {
when (id) {
1 -> {
img.setImageResource(R.mipmap.baicai_fruit)
}
2 -> {
img.setImageResource(R.mipmap.fanqiei_fruit)
}
3 -> {
img.setImageResource(R.mipmap.nangua_fruit)
}
4 -> {
img.setImageResource(R.mipmap.luobo_fruit)
}
5 -> {
img.setImageResource(R.mipmap.yumi_fruit)
}
6 -> {
img.setImageResource(R.mipmap.qiezi_fruit)
}
7 -> {
img.setImageResource(R.mipmap.xigua_fruit)
}
8 -> {
img.setImageResource(R.mipmap.putao_fruit)
}
9 -> {
img.setImageResource(R.mipmap.caomei_fruit)
}
}
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/adapter/SigninDropsAdapter.kt
View file @ c89d46de
...@@ -61,7 +61,7 @@ class SigninDropsAdapter : ...@@ -61,7 +61,7 @@ class SigninDropsAdapter :
val data = mList[position] val data = mList[position]
holder.tvDay.text = "第${data.id}天" holder.tvDay.text = "第${data.id}天"
if (data.status == 1) { if (data.status == 1) {
holder.tvStatus.text = "已领取" holder.tvStatus.text = "已领"
holder.ivStatus.setImageResource(R.drawable.tab_2) holder.ivStatus.setImageResource(R.drawable.tab_2)
} else { } else {
holder.tvStatus.text = "+${data.awardNum}" holder.tvStatus.text = "+${data.awardNum}"
......
app/src/main/java/com/ym/game/application/BaseApplication.kt
View file @ c89d46de
...@@ -31,7 +31,7 @@ class BaseApplication : MultiDexApplication() { ...@@ -31,7 +31,7 @@ class BaseApplication : MultiDexApplication() {
//第一步初始化 application //第一步初始化 application
AppliContext.init(this) AppliContext.init(this)
// Config.init(this) // Config.init(this)
NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成 NetConfig.Environment.PRODUCT
Constant.appLs = "afcbef40e31631d3"//appls Constant.appLs = "afcbef40e31631d3"//appls
AdManager.init(this) AdManager.init(this)
......
app/src/main/java/com/ym/game/view/HomeWareActivity.kt deleted 100644 → 0
View file @ 1124a0f5
package com.ym.game.view
import android.view.View
import com.umeng.analytics.MobclickAgent
import com.ym.game.netstate.NetStateChangeReceiver
import com.ym.library.net.BaseActivity
import com.ym.ddcy.R
import kotlinx.android.synthetic.main.activity_home_ware.*
/**
* @author (wangXuewei)
* @datetime 2020-10-15 22:07 GMT+8
* @detail :
*/
class HomeWareActivity :BaseActivity(){
override fun layoutID(): Int {
return R.layout.activity_home_ware;
}
override fun init() {
id_home_ware_close.setOnClickListener(View.OnClickListener {
finish()
})
id_tab_guo_shi_tv.setOnClickListener(View.OnClickListener {
setHomeWareList(1);
})
id_seed_tv.setOnClickListener(View.OnClickListener {
setHomeWareList(2);
})
id_tab_jia_su_ji_tv.setOnClickListener(View.OnClickListener {
setHomeWareList(3);
})
}
fun setHomeWareList(type:Int){
id_tab_guo_shi_tv.background=null
id_seed_tv.background=null
id_tab_jia_su_ji_tv.background=null
if(type==1){
id_tab_guo_shi_tv.background=resources.getDrawable(R.mipmap.home_tab_select)
}else if (type==2){
id_seed_tv.background=resources.getDrawable(R.mipmap.home_tab_select)
}else if (type == 3){
id_tab_jia_su_ji_tv.background=resources.getDrawable(R.mipmap.home_tab_select)
}
}
override fun onResume() {
super.onResume()
MobclickAgent.onResume(this)
}
override fun onPause() {
super.onPause()
MobclickAgent.onPause(this)
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/view/OrderListActivity.kt deleted 100644 → 0
View file @ 1124a0f5
package com.ym.game.view
import android.util.Log
import androidx.recyclerview.widget.LinearLayoutManager
import com.umeng.analytics.MobclickAgent
import com.ym.game.adapter.GameOrderListAdapter
import com.ym.game.module.OrderListEntity
import com.ym.library.net.BaseActivity
import com.ym.library.utils.Utils.str2Obj
import com.ym.ddcy.R
import kotlinx.android.synthetic.main.activity_order_list.*
/**
* @author (wangXuewei)
* @datetime 2020-10-18 16:30 GMT+8
* @detail :
*
*
*/
class OrderListActivity: BaseActivity() {
private var orderListAdapter: GameOrderListAdapter? = null;
override fun layoutID(): Int {
return R.layout.activity_order_list
}
override fun init() {
var orderStr= intent.getStringExtra("orderJson")
Log.d("wxw","orderStr"+orderStr);
if (orderStr!=null&&!orderStr.equals("")){
val str2Obj = str2Obj(orderStr, OrderListEntity::class.java)as OrderListEntity
orderListAdapter = GameOrderListAdapter()
id_rel_game_order_list?.adapter = orderListAdapter
id_rel_game_order_list?.layoutManager = LinearLayoutManager(this)
orderListAdapter?.appendToList(str2Obj.farmOrderDataList)
}
}
override fun onResume() {
super.onResume()
MobclickAgent.onResume(this)
}
override fun onPause() {
super.onPause()
MobclickAgent.onPause(this)
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @ c89d46de
...@@ -357,14 +357,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -357,14 +357,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
mLotteryResult?.awardNum ?: 0, mLotteryResult?.awardNum ?: 0,
mLotteryResult?.extJson mLotteryResult?.extJson
) )
} else {
MainDialog.showgetRedPackage(
context, type,
"转盘",
mLotteryResult?.awardNum ?: 0
)
} }
} }
// if (mLotteryResult?.awardType == 1) { // if (mLotteryResult?.awardType == 1) {
......
app/src/main/res/layout/activity_home_ware.xml deleted 100644 → 0
View file @ 1124a0f5
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/id_img_home_ware_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@mipmap/home_bg" />
<RelativeLayout
android:id="@+id/id_home_ware_content_rel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_5"
android:layout_marginLeft="100dp"
android:layout_centerInParent="true"
android:background="@mipmap/home_cotent_bg">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/id_tab_guo_shi_tv"
android:layout_width="0dp"
android:layout_height="@dimen/dp_45"
android:layout_weight="1"
android:text="果实"
android:gravity="center"
android:textStyle="bold"
android:textColor="#8F4C07"
android:background="@mipmap/home_tab_select" />
<TextView
android:id="@+id/id_seed_tv"
android:layout_width="0dp"
android:layout_height="@dimen/dp_45"
android:layout_weight="1"
android:gravity="center"
android:textStyle="bold"
android:text="种子" />
<TextView
android:id="@+id/id_tab_jia_su_ji_tv"
android:layout_width="0dp"
android:layout_height="@dimen/dp_45"
android:layout_weight="1"
android:gravity="center"
android:textStyle="bold"
android:text="加速剂" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</RelativeLayout>
<ImageView
android:id="@+id/id_img_home_ware_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/id_home_ware_content_rel"
android:layout_centerHorizontal="true"
android:layout_marginBottom="-30dp"
android:src="@mipmap/home_title" />
<ImageView
android:id="@+id/id_home_ware_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@+id/id_img_home_ware_title"
android:layout_alignRight="@+id/id_img_home_ware_title"
android:src="@mipmap/home_close" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/activity_order_list.xml deleted 100644 → 0
View file @ 1124a0f5
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/id_Rel_order_list_bg"
android:layout_width="wrap_content"
android:layout_height="500dp"
android:layout_centerInParent="true"
android:background="@mipmap/home_bg">
<LinearLayout
android:id="@+id/id_order_list_content_rel"
android:layout_width="wrap_content"
android:layout_height="400dp"
android:layout_centerHorizontal="true"
android:background="@mipmap/icon_content_bg"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/dp_5">
<TextView
android:id="@+id/id_tv_orderlist_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:text=""
android:textColor="#8F4C07"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/id_rel_game_order_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15" />
</LinearLayout>
<TextView
android:id="@+id/btn_get_drop_happy_accept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_order_list_content_rel"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/btn_selector"
android:gravity="center"
android:text="继续种植完成订单"
android:textColor="@color/white"
android:textSize="@dimen/sp_18"
android:textStyle="bold" />
</RelativeLayout>
<TextView
android:id="@+id/id_img_order_list_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/id_Rel_order_list_bg"
android:layout_centerHorizontal="true"
android:layout_marginBottom="-80dp"
android:background="@mipmap/icon_top_bg"
android:gravity="center"
android:paddingBottom="@dimen/dp_30"
android:text="未完成订单"
android:textColor="@color/white"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<ImageView
android:id="@+id/id_order_list_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/id_img_order_list_title"
android:layout_alignRight="@id/id_img_order_list_title"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:src="@mipmap/home_close" />
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_layout_cash_exchage.xml
View file @ c89d46de
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="568dp" android:layout_height="577dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginLeft="@dimen/dp_10" android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"> android:layout_marginRight="@dimen/dp_10">
...@@ -44,19 +44,25 @@ ...@@ -44,19 +44,25 @@
android:layout_below="@+id/iv_dialog_close" android:layout_below="@+id/iv_dialog_close"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <RelativeLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginTop="@dimen/dp_20"
android:layout_marginBottom="2.5dp" android:orientation="horizontal">
android:src="@mipmap/icon_cash_desc" />
<ImageView <ImageView
android:id="@+id/id_mg_cash_recode" 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_gravity="right" android:src="@mipmap/icon_cash_desc" />
android:src="@mipmap/icon_cash_recode" />
<ImageView
android:id="@+id/id_mg_cash_recode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:src="@mipmap/icon_cash_recode" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rl_cash_exchage" android:id="@+id/rl_cash_exchage"
......
app/src/main/res/layout/dialog_layout_get_rank_red_package.xml deleted 100644 → 0
View file @ 1124a0f5
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_red_package_bg"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:text="恭喜上榜"
android:textColor="@color/white"
android:textSize="36sp" />
<TextView
android:id="@+id/id_tv_rank"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:text="第0名"
android:textColor="@color/white"
android:textSize="20sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:orientation="horizontal">
<TextView
android:id="@+id/id_tv_moeny_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/white"
android:textSize="58sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_2"
android:text="元"
android:textColor="@color/white"
android:textSize="28sp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:id="@+id/id_tv_get"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_get_bg"
android:gravity="center"
android:text="开心收下"
android:textColor="#27292B"
android:textStyle="bold"
android:textSize="24sp" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/dialog_layout_get_red_package.xml deleted 100644 → 0
View file @ 1124a0f5
<?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">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_red_package_bg"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="80dp"
android:text="恭喜获得红包奖励"
android:textColor="@color/white"
android:textSize="22sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
android:orientation="horizontal">
<TextView
android:id="@+id/id_tv_moeny_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/white"
android:textSize="58sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_2"
android:text="元"
android:textColor="@color/white"
android:textSize="28sp"
android:textStyle="bold" />
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_2"
android:layout_marginTop="@dimen/dp_40"
android:text="已存入我的钱包"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/id_tv_get"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/icon_get_bg"
android:gravity="center"
android:text="开心收下"
android:textColor="#27292B"
android:textStyle="bold"
android:textSize="24sp" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/dialog_layout_with_draw_success.xml
View file @ c89d46de
...@@ -43,22 +43,13 @@ ...@@ -43,22 +43,13 @@
android:background="@mipmap/icon_content_bg"> android:background="@mipmap/icon_content_bg">
<ImageView <ImageView
android:id="@+id/id_img_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="35dp" android:layout_marginTop="35dp"
android:src="@mipmap/icon_top_bg" /> android:src="@mipmap/icon_top_bg" />
<TextView
android:id="@+id/id_tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_44"
android:text="兑换成功"
android:textColor="@color/white"
android:textSize="20sp" />
<LinearLayout <LinearLayout
android:id="@+id/id_ll_content" android:id="@+id/id_ll_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -84,18 +75,14 @@ ...@@ -84,18 +75,14 @@
</LinearLayout> </LinearLayout>
<TextView <ImageView
android:id="@+id/id_tv_go_on_make_money" android:id="@+id/id_tv_go_on_make_money"
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_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_20" android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/dialog_draw_btn_select" android:src="@drawable/dialog_draw_btn_select" />
android:gravity="center"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/item_game_order_list.xml deleted 100644 → 0
View file @ 1124a0f5
<?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="wrap_content"
android:layout_marginBottom="@dimen/dp_25"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/id_item_game_order_img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="20dp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:orientation="vertical">
<TextView
android:id="@+id/id_item_game_order_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_9"
android:text="玉米"
android:textColor="#8F4C07"
android:textSize="@dimen/sp_15"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/id_item_game_order_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="130dp"
android:layout_height="10dp"
android:max="100"
android:progress="40"
android:progressDrawable="@drawable/game_order_progress_bg" />
<TextView
android:id="@+id/id_item_game_order_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0/0"
android:layout_marginLeft="15dp"
android:textColor="#FF9128"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_get_water_task.xml
View file @ c89d46de
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="浇水10次" android:text="浇水10次"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="17sp" /> android:textSize="20sp"
android:textStyle="bold"/>
<TextView <TextView
...@@ -37,7 +38,7 @@ ...@@ -37,7 +38,7 @@
android:layout_marginTop="@dimen/dp_10" android:layout_marginTop="@dimen/dp_10"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="#8F6E42" android:textColor="#8F6E42"
android:textSize="12.5sp" android:textSize="16sp"
tools:text="10/10" /> tools:text="10/10" />
...@@ -52,8 +53,8 @@ ...@@ -52,8 +53,8 @@
<ImageView <ImageView
android:id="@+id/img_icon_item" android:id="@+id/img_icon_item"
android:layout_width="wrap_content" android:layout_width="@dimen/dp_18"
android:layout_height="wrap_content" android:layout_height="@dimen/dp_21"
android:layout_marginRight="@dimen/dp_3" android:layout_marginRight="@dimen/dp_3"
android:src="@mipmap/icon_speed_get" /> android:src="@mipmap/icon_speed_get" />
...@@ -63,7 +64,8 @@ ...@@ -63,7 +64,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="+0g" android:text="+0g"
android:textColor="#ED5430" android:textColor="#ED5430"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_18"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
......
app/src/main/res/layout/item_signin_drops.xml
View file @ c89d46de
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginLeft="2dp" android:layout_marginLeft="2dp"
android:gravity="center_horizontal"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_item_signin_day" android:id="@+id/tv_item_signin_day"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -25,99 +26,94 @@ ...@@ -25,99 +26,94 @@
<RelativeLayout <RelativeLayout
android:id="@+id/rl_root" android:id="@+id/rl_root"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="@dimen/dp_60"
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:background="@drawable/item_sing_bg" android:background="@drawable/item_sing_bg">
android:layout_height="@dimen/dp_60">
<TextView <TextView
android:id="@+id/tv_item_signin_status" android:id="@+id/tv_item_signin_status"
android:layout_width="match_parent" android:layout_width="match_parent"
android:gravity="center"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:background="@drawable/sing_bg_nom"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"
android:background="@drawable/sing_bg_nom"
android:gravity="center"
android:paddingTop="1dp"
android:paddingBottom="1dp"
android:text="已领取" android:text="已领取"
android:textStyle="bold"
android:textColor="#99642D2D" android:textColor="#99642D2D"
android:textSize="8sp" /> android:textSize="@dimen/sp_11"
android:textStyle="bold"/>
<ImageView <ImageView
android:id="@+id/iv_item_signin_status" android:id="@+id/iv_item_signin_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:src="@drawable/tab_1"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content" android:layout_height="wrap_content"
/> android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:src="@drawable/tab_1" />
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<?xml version="1.0" encoding="utf-8"?>--> <!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:gravity="center_horizontal"-->
<!-- android:gravity="center_horizontal"--> <!-- android:orientation="vertical">-->
<!-- android:orientation="vertical">-->
<!-- <LinearLayout-->
<!-- <LinearLayout--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- android:orientation="vertical">-->
<!-- <RelativeLayout-->
<!-- <RelativeLayout--> <!-- android:id="@+id/rl_root"-->
<!-- android:id="@+id/rl_root"--> <!-- android:layout_width="70dp"-->
<!-- android:layout_width="70dp"-->
<!-- android:layout_height="@dimen/dp_74">-->
<!-- android:layout_height="@dimen/dp_74">-->
<!-- <ImageView-->
<!-- <ImageView--> <!-- android:id="@+id/iv_item_signin_status"-->
<!-- android:id="@+id/iv_item_signin_status"--> <!-- android:layout_width="100dp"-->
<!-- android:layout_width="100dp"--> <!-- android:layout_height="match_parent"-->
<!-- android:layout_height="match_parent"--> <!-- android:src="@mipmap/icon_main_popup_singnin_received" />-->
<!-- android:src="@mipmap/icon_main_popup_singnin_received" />-->
<!-- <TextView-->
<!-- <TextView--> <!-- android:id="@+id/tv_item_signin_status"-->
<!-- android:id="@+id/tv_item_signin_status"--> <!-- 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_alignParentBottom="true"--> <!-- android:layout_centerHorizontal="true"-->
<!-- android:layout_centerHorizontal="true"--> <!-- android:layout_marginBottom="@dimen/dp_11"-->
<!-- android:layout_marginBottom="@dimen/dp_11"--> <!-- android:text="60g"-->
<!-- android:text="60g"--> <!-- android:textColor="#642D2D"-->
<!-- android:textColor="#642D2D"--> <!-- android:textSize="10sp" />-->
<!-- android:textSize="10sp" />--> <!-- </RelativeLayout>-->
<!-- </RelativeLayout>-->
<!-- <TextView-->
<!-- <TextView--> <!-- android:id="@+id/tv_item_signin_day"-->
<!-- android:id="@+id/tv_item_signin_day"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_below="@+id/rl_root"-->
<!-- android:layout_below="@+id/rl_root"--> <!-- android:layout_gravity="center_horizontal"-->
<!-- android:layout_gravity="center_horizontal"--> <!-- android:layout_marginTop="6dp"-->
<!-- android:layout_marginTop="6dp"--> <!-- android:text="第N天"-->
<!-- android:text="第N天"--> <!-- android:textColor="#826033"-->
<!-- android:textColor="#826033"--> <!-- android:textSize="12.5sp" />-->
<!-- android:textSize="12.5sp" />-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!--</LinearLayout>-->
<!--</LinearLayout>--> \ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_watering_task.xml
View file @ c89d46de
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="浇水10次" android:text="浇水10次"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="17sp" android:textSize="@dimen/sp_20"
android:textStyle="bold"/> android:textStyle="bold" />
<LinearLayout <LinearLayout
android:id="@+id/layout_watering_progress" android:id="@+id/layout_watering_progress"
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
android:includeFontPadding="false" android:includeFontPadding="false"
android:text="1" android:text="1"
android:textColor="#8F6E42" android:textColor="#8F6E42"
android:textSize="12.5sp" /> android:textSize="16sp" />
</LinearLayout> </LinearLayout>
...@@ -85,7 +85,8 @@ ...@@ -85,7 +85,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="+0g" android:text="+0g"
android:textColor="#ED5430" android:textColor="#ED5430"
android:textSize="@dimen/sp_12" /> android:textSize="@dimen/sp_18"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView
......
app/src/main/res/layout/item_with_draw_list.xml
View file @ c89d46de
...@@ -19,22 +19,19 @@ ...@@ -19,22 +19,19 @@
<ImageView <ImageView
android:id="@+id/id_img_icon" android:id="@+id/id_img_icon"
android:layout_width="@dimen/dp_67" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_36" android:layout_height="wrap_content"
android:layout_marginLeft="2dp" android:layout_marginLeft="14dp"
android:layout_marginTop="@dimen/dp_15" android:layout_marginTop="@dimen/dp_15"
android:src="@mipmap/baicai_fruit" /> android:src="@mipmap/baicai_fruit" />
<ImageView <ImageView
android:id="@+id/id_img_mark" android:id="@+id/id_img_mark"
android:layout_width="46dp" android:layout_width="wrap_content"
android:layout_height="@dimen/dp_20" android:layout_height="wrap_content"
android:layout_below="@+id/id_img_icon" android:layout_below="@+id/id_img_icon"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp_18" android:layout_marginLeft="@dimen/dp_18"
android:layout_marginTop="-10dp"
android:layout_marginBottom="6dp"
android:src="@mipmap/icon_fuli" /> android:src="@mipmap/icon_fuli" />
...@@ -52,10 +49,11 @@ ...@@ -52,10 +49,11 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left" android:layout_gravity="left"
android:layout_marginLeft="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5" android:layout_marginBottom="@dimen/dp_5"
android:text="fdafas" android:text="fdafas"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="12sp" /> android:textSize="14sp" />
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -87,15 +85,28 @@ ...@@ -87,15 +85,28 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<TextView <LinearLayout
android:id="@+id/id_tv_cash"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:gravity="center"
android:text="" <TextView
android:textColor="#ED5430" android:id="@+id/id_tv_cash"
android:textSize="@dimen/sp_15" android:layout_width="wrap_content"
android:textStyle="bold" /> android:layout_height="wrap_content"
android:gravity="center"
android:text=""
android:textColor="#ED5430"
android:textSize="@dimen/sp_20"
android:textStyle="bold" />
<TextView
android:id="@+id/id_tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="#ED5430"
android:textSize="@dimen/sp_14" />
</LinearLayout>
<ImageView <ImageView
android:id="@+id/id_img_duihuan" android:id="@+id/id_img_duihuan"
......
app/src/main/res/layout/layout_popup_drops.xml
View file @ c89d46de
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="连续签到" android:text="连续签到"
android:textColor="#826033" android:textColor="#826033"
android:textSize="18sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text=" 7 天" android:text=" 7 天"
android:textColor="#E85740" android:textColor="#E85740"
android:textSize="20sp" android:textSize="26sp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="，领惊喜大奖" android:text="，领惊喜大奖"
android:textColor="#826033" android:textColor="#826033"
android:textSize="18sp" android:textSize="22sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
......
library/src/main/java/com/ym/library/config/AdManager.kt 100644 → 100755
View file @ c89d46de
...@@ -14,14 +14,10 @@ import com.bytedance.sdk.openadsdk.TTAdConfig ...@@ -14,14 +14,10 @@ import com.bytedance.sdk.openadsdk.TTAdConfig
import com.bytedance.sdk.openadsdk.TTAdConstant import com.bytedance.sdk.openadsdk.TTAdConstant
import com.bytedance.sdk.openadsdk.TTAdSdk import com.bytedance.sdk.openadsdk.TTAdSdk
import com.bytedance.sdk.openadsdk.TTRewardVideoAd import com.bytedance.sdk.openadsdk.TTRewardVideoAd
import com.kwad.sdk.api.KsAdSDK
import com.kwad.sdk.api.SdkConfig
import com.qq.e.ads.rewardvideo.RewardVideoAD import com.qq.e.ads.rewardvideo.RewardVideoAD
import com.qq.e.comm.managers.GDTADManager import com.qq.e.comm.managers.GDTADManager
import com.sigmob.windad.WindAdOptions import com.sigmob.windad.WindAdOptions
import com.sigmob.windad.WindAds import com.sigmob.windad.WindAds
import com.tz.sdk.core.engine.ADEngine
import com.tz.sdk.core.engine.ADEngineConfig
import com.wannuosili.sdk.WNAdConfig import com.wannuosili.sdk.WNAdConfig
import com.wannuosili.sdk.WNAdSdk import com.wannuosili.sdk.WNAdSdk
import com.ym.admodule.listener.ZXADDrawListener import com.ym.admodule.listener.ZXADDrawListener
...@@ -123,13 +119,13 @@ object AdManager { ...@@ -123,13 +119,13 @@ object AdManager {
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
init(//TODO 替换id init(//替换id
application, ZXADConfig application, ZXADConfig
.csjId("5116010") .csjId("5116010")
.gdtId("1111153326") .gdtId("1111153326")
.rsId("31158") .rsId("31158")
// .bdId("ba584026") // .bdId("ba584026")
// .signMob("5105", "9d597f774eb14956") .signMob("5105", "17ffd928cc3b193c")
.ksId("533500011") .ksId("533500011")
.ylbId("10000188") .ylbId("10000188")
.Build() .Build()
...@@ -311,6 +307,10 @@ object AdManager { ...@@ -311,6 +307,10 @@ object AdManager {
container: FrameLayout, container: FrameLayout,
zxadListener: ZXADSplashListener zxadListener: ZXADSplashListener
) { ) {
if (!isInit) {
zxadListener.onTimeout()
return
}
ZXADClient.adApi.getAd(type).compose(RxSchedulers.observableIO2Main()) ZXADClient.adApi.getAd(type).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<List<NewsEntity>>() { .subscribe(object : BaseObserver<List<NewsEntity>>() {
override fun onSuccess(result: List<NewsEntity>) { override fun onSuccess(result: List<NewsEntity>) {
...@@ -365,6 +365,10 @@ object AdManager { ...@@ -365,6 +365,10 @@ object AdManager {
zxadExpressListener: ZXADExpressListener, zxadExpressListener: ZXADExpressListener,
container: FrameLayout container: FrameLayout
) { ) {
if (!isInit) {
zxadExpressListener.onFail()
return
}
if (AdCache.nativeList.get(adType) == null || AdCache.nativeList.get(adType)!!.size <= 0) { if (AdCache.nativeList.get(adType) == null || AdCache.nativeList.get(adType)!!.size <= 0) {
ZXADClient.adApi.getAd(adType).compose(RxSchedulers.observableIO2Main()) ZXADClient.adApi.getAd(adType).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<List<NewsEntity>>() { .subscribe(object : BaseObserver<List<NewsEntity>>() {
...@@ -412,6 +416,9 @@ object AdManager { ...@@ -412,6 +416,9 @@ object AdManager {
container: FrameLayout, container: FrameLayout,
adType: String adType: String
) { ) {
if (!isInit) {
return
}
var arrayList = result as ArrayList var arrayList = result as ArrayList
var newsEntity = arrayList[0] var newsEntity = arrayList[0]
...@@ -479,8 +486,11 @@ object AdManager { ...@@ -479,8 +486,11 @@ object AdManager {
//加载 激励视频广告 和 全屏广告 //加载 激励视频广告 和 全屏广告
fun loadRewardVideoAd(slotName: String, mActivity: Activity, listener: ZXADVideoListener) { fun loadRewardVideoAd(slotName: String, mActivity: Activity, listener: ZXADVideoListener) {
if (!isInit) {
listener.onError()
return
}
if (AdCache.rewardList.get(slotName) == null || AdCache.rewardList.get(slotName)?.size!! <= 0) { if (AdCache.rewardList.get(slotName) == null || AdCache.rewardList.get(slotName)?.size!! <= 0) {
Log.e(TAG, "请求服务器 获取广告数据") Log.e(TAG, "请求服务器 获取广告数据")
ZXADClient.adApi.getAd(slotName).compose(RxSchedulers.observableIO2Main()) ZXADClient.adApi.getAd(slotName).compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<List<NewsEntity>>() { .subscribe(object : BaseObserver<List<NewsEntity>>() {
......
library/src/main/java/com/ym/library/config/ZXADSizeConfig.kt
View file @ c89d46de
package com.ym.library.config package com.ym.library.config
data class ZXADSizeConfig(var width:Int data class ZXADSizeConfig(
, var height:Int) var width: Int
\ No newline at end of file , var height:Int)
\ No newline at end of file
library/src/main/java/com/ym/library/csj/TTADUtils.kt
View file @ c89d46de
...@@ -4,7 +4,6 @@ package com.ym.library.csj ...@@ -4,7 +4,6 @@ package com.ym.library.csj
import android.R.attr.orientation import android.R.attr.orientation
import android.app.Activity import android.app.Activity
import android.content.Context import android.content.Context
import android.content.SyncStats
import android.util.Log import android.util.Log
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
...@@ -21,9 +20,7 @@ import com.ym.library.listener.ZXADExpressListener ...@@ -21,9 +20,7 @@ import com.ym.library.listener.ZXADExpressListener
import com.ym.library.listener.ZXADSplashListener import com.ym.library.listener.ZXADSplashListener
import com.ym.library.listener.ZXADVideoListener import com.ym.library.listener.ZXADVideoListener
import com.ym.library.module.NewsEntity import com.ym.library.module.NewsEntity
import com.ym.library.net.AdUpload
import com.ym.library.utils.EventUtils import com.ym.library.utils.EventUtils
import com.ym.library.utils.LogHelper
import com.ym.library.widget.DislikeDialog import com.ym.library.widget.DislikeDialog
......
library/src/main/java/com/ym/library/down/UpdateVersionPresenter.kt
View file @ c89d46de
...@@ -96,23 +96,28 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter { ...@@ -96,23 +96,28 @@ class UpdateVersionPresenter : UpdateVersionContract.Presenter {
override fun checkVersion(isShowToast: Boolean) { override fun checkVersion(isShowToast: Boolean) {
VersionClient.userApi.getVersion().compose(RxSchedulers.observableIO2Main()) VersionClient.userApi.getVersion().compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<VersionEntity>() { .subscribe(object : BaseObserver<VersionEntity?>() {
override fun onSuccess(dataBean: VersionEntity) { override fun onSuccess(dataBean: VersionEntity?) {
Log.d("wxw","version"+Utils.obj2Str(dataBean)) if (dataBean != null) {
if (dataBean.vc > PhoneUtils.getAppVersionCode(AppliContext.get()) && "" != dataBean.dl_url) { Log.d("wxw", "version" + Utils.obj2Str(dataBean))
mUrl = dataBean.dl_url if (dataBean.vc > PhoneUtils.getAppVersionCode(AppliContext.get()) && "" != dataBean.dl_url) {
if (dataBean.type == 1) { mUrl = dataBean.dl_url
SettingPreference.setCancelUpdateDate(AppliContext.get(), "") if (dataBean.type == 1) {
mView?.showMandatoryUpdateDialog(dataBean.title, dataBean.description) SettingPreference.setCancelUpdateDate(AppliContext.get(), "")
mView?.showMandatoryUpdateDialog(
dataBean.title,
dataBean.description
)
} else {
mView?.showNonMandatoryUpdateDialog(
dataBean.title,
dataBean.description
)
}
} else { } else {
mView?.showNonMandatoryUpdateDialog( if (isShowToast) {
dataBean.title, mView?.onNoUpdate()
dataBean.description }
)
}
} else {
if (isShowToast) {
mView?.onNoUpdate()
} }
} }
} }
......
library/src/main/java/com/ym/library/net/IUserApi.kt
View file @ c89d46de
...@@ -15,8 +15,8 @@ interface IUserApi { ...@@ -15,8 +15,8 @@ interface IUserApi {
* *
* @return * @return
*/ */
@GET("api/v1/version/com.ym.ddcy") @GET("app/v1/version")
fun getVersion(): Observable<Response<VersionEntity>> fun getVersion(): Observable<Response<VersionEntity?>>
/** /**
* 游客登录 * 游客登录
......
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ c89d46de
...@@ -36,12 +36,12 @@ public class NetConfig { ...@@ -36,12 +36,12 @@ public class NetConfig {
sEnvironment = s; sEnvironment = s;
switch (sEnvironment) { switch (sEnvironment) {
case PRODUCT: case PRODUCT:
BASE_URL = "https://api.zhangxinhulian.com/"; BASE_URL = "https://fsapi.ihuomao.com/";
BASE_WEB_URL = "https://www.zhangxinhulian.com/"; BASE_WEB_URL = "https://www.zhangxinhulian.com/";
BASE_NEW_URL = "http://newapi.zhangxinhulian.com/"; BASE_NEW_URL = "http://newapi.zhangxinhulian.com/";
BASE_FEED_URL = "https://fsapi.ihuomao.com/"; BASE_FEED_URL = "https://fsapi.ihuomao.com/";
BASE_AD_URL = "https://bs.ihuomao.com/"; BASE_AD_URL = "https://bs.ihuomao.com/";
URL_REPORT_BASE = "https://report.ihuomao.com/"; URL_REPORT_BASE = "http://report.ihuomao.com/";
break; break;
case TEST: case TEST:
BASE_URL = "https://sandbox.zhangxinhulian.com/"; BASE_URL = "https://sandbox.zhangxinhulian.com/";
...@@ -53,7 +53,7 @@ public class NetConfig { ...@@ -53,7 +53,7 @@ public class NetConfig {
break; break;
default: default:
BASE_URL = "http://apitest.zhangxinhulian.com/"; BASE_URL = "http://feedapitest.zhangxinhulian.com/";
BASE_WEB_URL = "http://www.zhangxinhulian.com:8888/"; BASE_WEB_URL = "http://www.zhangxinhulian.com:8888/";
BASE_NEW_URL = "http://newapitest.zhangxinhulian.com/"; BASE_NEW_URL = "http://newapitest.zhangxinhulian.com/";
BASE_FEED_URL = "http://feedapitest.zhangxinhulian.com/"; BASE_FEED_URL = "http://feedapitest.zhangxinhulian.com/";
...@@ -241,7 +241,7 @@ public class NetConfig { ...@@ -241,7 +241,7 @@ public class NetConfig {
public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表 public static final String URL_GAME_WITHDRAW_LIST = "app/v1/game/ddcy/withdraw_list";//兑换列表
public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口 public static final String URL_GAME_DOWD = "app/v1/game/ddcy/do_wd";//兑换接口
public static final String URL_GAME_WD_HISTORY = "app/v1/game/farm/wd_history";//兑换记录 public static final String URL_GAME_WD_HISTORY = "app/v1/game/ddcy/wd_history";//兑换记录
public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receive";//兑换记录 public static final String URL_GAME_ACCELERATORS_TASK_RECEIVE = "app/v1/game/ddcy/accelerators_task_receive";//兑换记录
public static final String URL_GAME_USER_GUIDE = "app/v1/game/ddcy/user_guide";//兑换记录 public static final String URL_GAME_USER_GUIDE = "app/v1/game/ddcy/user_guide";//兑换记录
} }
......
library/src/main/java/com/ym/library/utils/CenterDialog.kt
View file @ c89d46de
...@@ -380,8 +380,10 @@ object CenterDialog : BaseDialog() { ...@@ -380,8 +380,10 @@ object CenterDialog : BaseDialog() {
Gravity.CENTER Gravity.CENTER
) )
val imgbg = mDialogView?.findViewById<ImageView>(R.id.iv_get_bg) val imgbg = mDialogView?.findViewById<ImageView>(R.id.iv_get_bg)
Log.e("MM", "t" + type) if(type==3){
val tvGetDropCount = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count) imgbg.setImageResource(R.drawable.icon_diamand)
}
val tvGetDropCount = mDialogView?.findViewById<TextView>(R.id.tv_get_count)
tvGetDropCount.text = "+${rewardCount}" tvGetDropCount.text = "+${rewardCount}"
// ToponManager.loadNative((context as Activity),layoutAd,object : ToponNativeListener { // ToponManager.loadNative((context as Activity),layoutAd,object : ToponNativeListener {
......
library/src/main/res/layout/dialog_get_diamand.xml
View file @ c89d46de
...@@ -12,26 +12,66 @@ ...@@ -12,26 +12,66 @@
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="370dp">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/icon_bg11">
</RelativeLayout>
<ImageView
android:id="@+id/lv_get_drop_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="18dp" android:layout_alignParentRight="true"
android:layout_marginTop="71dp" android:layout_marginTop="70dp"
android:layout_marginRight="18dp" android:layout_marginRight="30dp"
android:background="@drawable/icon_main_dialog_get_drops_bg"> android:src="@drawable/icon_new_close" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="350dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/icon_content_bg">
<ImageView
android:id="@+id/id_img_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="35dp"
android:src="@drawable/icon_top_bg" />
<TextView
android:id="@+id/id_tv_gongxi_get"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="44dp"
android:text="恭喜获得钻石"
android:textColor="@color/white"
android:textSize="20sp"
android:visibility="visible" />
<LinearLayout <LinearLayout
android:id="@+id/id_ll_content" android:id="@+id/id_ll_content"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="150dp"
android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginLeft="20dp" android:layout_marginTop="60dp"
android:layout_marginTop="15dp" android:orientation="horizontal"
android:layout_marginRight="20dp" android:visibility="visible">
android:background="@drawable/icon_content_bg"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -43,19 +83,18 @@ ...@@ -43,19 +83,18 @@
<ImageView <ImageView
android:id="@+id/iv_get_bg" android:id="@+id/iv_get_bg"
android:layout_width="80dp" android:layout_width="wrap_content"
android:layout_height="80dp" android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/icon_diamand" /> android:src="@drawable/icon_diamand" />
<TextView <TextView
android:id="@+id/tv_get_drop_count" android:id="@+id/tv_get_count"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:textColor="#7C1714" android:textColor="#7C1714"
android:textSize="24sp" android:textSize="20sp"
tools:text="+40g" /> tools:text="*1" />
</LinearLayout> </LinearLayout>
...@@ -67,40 +106,8 @@ ...@@ -67,40 +106,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_content" android:layout_below="@+id/id_ll_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="20dp" android:background="@drawable/btn_selector" />
android:layout_marginBottom="28dp"
android:background="@drawable/btn_selector"
android:gravity="center"
android:text=""
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/icon_top_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="40dp"
android:text="恭喜获得钻石"
android:textColor="@color/white"
android:textSize="24sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/lv_get_drop_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:paddingRight="20dp"
android:src="@drawable/icon_main_popup_close" />
</RelativeLayout> </RelativeLayout>
......
library/src/main/res/layout/dialog_lib_get_money.xml
View file @ c89d46de
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
android:layout_height="313dp" android:layout_height="313dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/icon_main_dialog_get_drops_bg" /> android:src="@drawable/icon_bg11" />
<ImageView <ImageView
......
userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt
View file @ c89d46de
...@@ -18,7 +18,6 @@ import kotlinx.android.synthetic.main.activity_setting.* ...@@ -18,7 +18,6 @@ import kotlinx.android.synthetic.main.activity_setting.*
import kotlinx.android.synthetic.main.layout_user_toolbar.* import kotlinx.android.synthetic.main.layout_user_toolbar.*
class SettingActivity : BaseActivity() { class SettingActivity : BaseActivity() {
override fun layoutID(): Int = R.layout.activity_setting override fun layoutID(): Int = R.layout.activity_setting
override fun before() { override fun before() {
...@@ -40,7 +39,7 @@ class SettingActivity : BaseActivity() { ...@@ -40,7 +39,7 @@ class SettingActivity : BaseActivity() {
copy() copy()
} }
rl_back.setOnClickListener { finish() } rl_back.setOnClickListener { finish() }
// id_iv_back.setOnClickListener { finish() } // id_iv_back.setOnClickListener { finish() }
// tv_user_toolbar_title.text = "设置" // tv_user_toolbar_title.text = "设置"
//用户协议 //用户协议
tv_setting_user_agreement.setOnClickListener { tv_setting_user_agreement.setOnClickListener {
...@@ -59,11 +58,13 @@ class SettingActivity : BaseActivity() { ...@@ -59,11 +58,13 @@ class SettingActivity : BaseActivity() {
val updateVersionManager = this?.let { it1 -> UpdateVersionManager(it1) } val updateVersionManager = this?.let { it1 -> UpdateVersionManager(it1) }
updateVersionManager?.checkUpdate(true) updateVersionManager?.checkUpdate(true)
} }
AdManager.loadFeedAd( AdManager.loadFeedAd(
ADConfig.AD_IMG_FADE, ADConfig.AD_IMG_FADE,
this, this,
ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 58, 275), ZXADSizeConfig(
Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 58,
(Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 58) * 0.66.toInt()
),
object : object :
ZXADExpressListener { ZXADExpressListener {
override fun onError(p1: String?) { override fun onError(p1: String?) {
......
userinfo/src/main/res/layout/item_withdrawals_record.xml
View file @ c89d46de
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:src="@drawable/icon_withdraw_success"
android:visibility="gone" /> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>
\ No newline at end of file
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