Skip to content

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

提交代码

parent 27af6825
Hide whitespace changes
Inline Side-by-side
Showing with 667 additions and 20 deletions
app/src/main/java/com/ym/game/GameActivity.kt
View file @ 2821a61a
...@@ -63,10 +63,15 @@ class GameActivity : UnityPlayerActivity() { ...@@ -63,10 +63,15 @@ class GameActivity : UnityPlayerActivity() {
* 幸运转盘 * 幸运转盘
*/ */
fun luckyTurntable() { fun luckyTurntable() {
if (Utils.isFastClick()) { this.runOnUiThread(object : Runnable {
TurntableDialog.showTurntable(this) override fun run() {
RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED) if (Utils.isFastClick()) {
} TurntableDialog.showTurntable(this@GameActivity)
RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_TURNTABLE_LOTTERYED)
}
}
})
} }
......
app/src/main/java/com/ym/game/module/FlyBoxEntity.kt 0 → 100644
View file @ 2821a61a
package com.ym.game.module
class FlyBoxEntity {
var type:Int?=0
var awardNum:Int?=0
}
\ No newline at end of file
app/src/main/java/com/ym/game/module/TurntableEntity.kt
View file @ 2821a61a
...@@ -18,8 +18,15 @@ class TurntableEntity { ...@@ -18,8 +18,15 @@ class TurntableEntity {
var lotteryNum: Int? = 0 var lotteryNum: Int? = 0
var countDownSecond: Int? = 0 var countDownSecond: Int? = 0
var showVideo: Int? = 0 var showVideo: Int? = 0
var extJson: SeedListEntity? = null
} }
class SeedListEntity {
var seedList: MutableList<a> = ArrayList()
}
class a {
var id: Int = 0
var num: Int = 0
}
} }
\ No newline at end of file
app/src/main/java/com/ym/game/net/IGameApi.kt
View file @ 2821a61a
...@@ -132,5 +132,15 @@ interface IGameApi { ...@@ -132,5 +132,15 @@ interface IGameApi {
* @return * @return
*/ */
@POST(NetConfig.Game.URL_GAME_INCR_ACCELERATORS) @POST(NetConfig.Game.URL_GAME_INCR_ACCELERATORS)
fun getVideoAcceleratorsReceive(): Observable<Response<StatusEntity>>
/**
* 看视频获得加速剂
* @param
* @paramq
* @return
*/
@POST(NetConfig.Game.URL_GAME_OPEN_BOX)
fun getopenBox(): Observable<Response<StatusEntity>>
fun getVideoAcceleratorsReceive(@Query("id") id: Int): Observable<Response<StatusEntity>> fun getVideoAcceleratorsReceive(@Query("id") id: Int): Observable<Response<StatusEntity>>
} }
\ No newline at end of file
app/src/main/java/com/ym/game/view/MainDialog.kt
View file @ 2821a61a
...@@ -5,8 +5,14 @@ import android.content.Context ...@@ -5,8 +5,14 @@ import android.content.Context
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.FrameLayout
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.TextView
import com.ym.game.module.TurntableEntity
import com.ym.library.AppliContext import com.ym.library.AppliContext
import com.ym.library.utils.PhoneUtils import com.ym.library.utils.PhoneUtils
import com.ym.xync.R
object MainDialog { object MainDialog {
...@@ -34,4 +40,186 @@ object MainDialog { ...@@ -34,4 +40,186 @@ object MainDialog {
window?.setWindowAnimations(animation)//设置动画 window?.setWindowAnimations(animation)//设置动画
return mDialogView return mDialogView
} }
/**
* 转盘奖励
* type: 奖励类型
* waterDropCount: 奖励数量
* adType: 广告的类型
*/
fun showgetWaterDrop(
context: Context?,
type: Int,
adType: String,
rewardCount: Int,
list: TurntableEntity.SeedListEntity?
) {
if (context == null) {
return
}
val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_get_water_drop,
context,
mDialog,
0,
Gravity.CENTER
)
val ivGetDropBg = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg)
val tvGetDropCount = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count)
val layoutAd = mDialogView?.findViewById<FrameLayout>(R.id.layout_get_drop_ad)
val llcontent2=mDialogView?.findViewById<LinearLayout>(R.id.id_ll_content_2)
val ivGetDropBg2 = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg2)
val tvGetDropCount2 = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count2)
val llcontent3=mDialogView?.findViewById<LinearLayout>(R.id.id_ll_content_3)
val ivGetDropBg3 = mDialogView?.findViewById<ImageView>(R.id.iv_get_drop_bg3)
val tvGetDropCount3 = mDialogView?.findViewById<TextView>(R.id.tv_get_drop_count3)
//3 种子 4 金币 5 加速剂
when (type) {
3 -> {
llcontent2.visibility=View.GONE
llcontent3.visibility=View.GONE
if (list?.seedList?.size == 1) {
setImage(ivGetDropBg,list?.seedList[0].id)
tvGetDropCount.text = "x${list?.seedList[0].num}"
} else if (list?.seedList?.size == 2) {
llcontent2.visibility=View.VISIBLE
setImage(ivGetDropBg,list?.seedList[1].id)
setImage(ivGetDropBg2,list?.seedList[1].id)
tvGetDropCount.text = "x${list?.seedList[1].num}"
tvGetDropCount2.text = "x${list?.seedList[1].num}"
} else if (list?.seedList?.size == 3){
llcontent2.visibility=View.VISIBLE
llcontent3.visibility=View.VISIBLE
setImage(ivGetDropBg,list?.seedList[2].id)
setImage(ivGetDropBg2,list?.seedList[2].id)
setImage(ivGetDropBg3,list?.seedList[2].id)
tvGetDropCount.text = "x${list?.seedList[2].num}"
tvGetDropCount2.text = "x${list?.seedList[2].num}"
tvGetDropCount3.text = "x${list?.seedList[2].num}"
}
}
4 -> {
ivGetDropBg.setImageResource(R.mipmap.icon_coin)
tvGetDropCount.text = "+${rewardCount}"
}
5 -> {
ivGetDropBg.setImageResource(R.mipmap.icon_speed_water)
tvGetDropCount.text = "+${rewardCount}"
}
}
//shwoAd(adType, context, layoutAd)
mDialogView.findViewById<TextView>(R.id.btn_get_drop_happy_accept).setOnClickListener {
mDialog.dismiss()
}
mDialogView.findViewById<ImageView>(R.id.lv_get_drop_close).setOnClickListener {
mDialog.dismiss()
}
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
}
fun setImage(img:ImageView,id:Int){
when (id){
1->{
img.setImageResource(R.mipmap.img_cabbage)
}
2->{
img.setImageResource(R.mipmap.img_tomato)
}
3->{
img.setImageResource(R.mipmap.img_pumpkin)
}
4->{
img.setImageResource(R.mipmap.img_radish)
}
5->{
img.setImageResource(R.mipmap.img_corn)
}
6->{
img.setImageResource(R.mipmap.img_eggplant)
}
7->{
img.setImageResource(R.mipmap.img_melon)
}
8->{
img.setImageResource(R.mipmap.img_grape)
}
9->{
img.setImageResource(R.mipmap.img_strawberry)
}
}
}
/**
* 转盘得到红包奖励
* type: 奖励类型
* waterDropCount: 奖励数量
* adType: 广告的类型
*/
fun showgetRedPackage(
context: Context?,
type: Int,
adType: String,
rewardCount: Int
) {
if (context == null) {
return
}
val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_get_red_package,
context,
mDialog,
0,
Gravity.CENTER
)
val tvmoneycount = mDialogView?.findViewById<TextView>(R.id.id_tv_moeny_count)
tvmoneycount.text = "${rewardCount}"
mDialogView.findViewById<TextView>(R.id.id_tv_get).setOnClickListener {
mDialog.dismiss()
}
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
}
fun showopenBox(
context: Context?
) {
if (context == null) {
return
}
val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_layout_get_red_package,
context,
mDialog,
0,
Gravity.CENTER
)
val tvmoneycount = mDialogView?.findViewById<TextView>(R.id.id_tv_moeny_count)
mDialogView.findViewById<TextView>(R.id.id_tv_get).setOnClickListener {
mDialog.dismiss()
}
mDialog.setCanceledOnTouchOutside(false)
mDialog.setCancelable(false)
mDialog.show()
}
} }
\ No newline at end of file
app/src/main/java/com/ym/game/view/TurntableDialog.kt
View file @ 2821a61a
package com.ym.game.view package com.ym.game.view
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity
import android.app.Dialog import android.app.Dialog
import android.content.Context import android.content.Context
import android.os.CountDownTimer import android.os.CountDownTimer
...@@ -9,12 +8,9 @@ import android.view.Gravity ...@@ -9,12 +8,9 @@ import android.view.Gravity
import android.view.View import android.view.View
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import com.anythink.core.api.ATAdInfo
import com.anythink.core.api.AdError
import com.ym.game.contract.TurntableContract import com.ym.game.contract.TurntableContract
import com.ym.game.module.TurntableEntity import com.ym.game.module.TurntableEntity
import com.ym.game.presenter.TurntablePresenter import com.ym.game.presenter.TurntablePresenter
import com.ym.library.module.AdEntity
import com.ym.library.rxbus.RxBusConstant import com.ym.library.rxbus.RxBusConstant
import com.ym.library.rxbus.RxBusUtil import com.ym.library.rxbus.RxBusUtil
import com.ym.library.rxbus.Subscribe import com.ym.library.rxbus.Subscribe
...@@ -22,6 +18,7 @@ import com.ym.library.rxbus.ThreadMode ...@@ -22,6 +18,7 @@ import com.ym.library.rxbus.ThreadMode
import com.ym.library.utils.EventUtils import com.ym.library.utils.EventUtils
import com.ym.library.utils.LogUtils import com.ym.library.utils.LogUtils
import com.ym.library.utils.Utils import com.ym.library.utils.Utils
import com.ym.xync.R
import com.ym.module.toponad.AdID import com.ym.module.toponad.AdID
import com.ym.module.toponad.ToponManager import com.ym.module.toponad.ToponManager
import com.ym.module.toponad.listener.ToponRewardListener import com.ym.module.toponad.listener.ToponRewardListener
...@@ -257,13 +254,28 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View { ...@@ -257,13 +254,28 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
tvTurntableCount?.text = "剩余次数: ${mLotteryResult?.lotteryNum}" tvTurntableCount?.text = "剩余次数: ${mLotteryResult?.lotteryNum}"
RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_UPDATE_HOME_INFO) RxBusUtil.getDefault().send(RxBusConstant.RX_MAIN_UPDATE_HOME_INFO)
var type = mLotteryResult?.awardType
if (type != null) {
if (type != 6) {
MainDialog.showgetWaterDrop(
context, type,
"转盘",
mLotteryResult?.awardNum ?: 0,
mLotteryResult?.extJson
)
} else {
MainDialog.showgetRedPackage(
context, type,
"转盘",
mLotteryResult?.awardNum ?: 0
)
}
}
// if (mLotteryResult?.awardType == 1) { // if (mLotteryResult?.awardType == 1) {
// MainDialog.showgetWaterDrop(
// context, 1,
// "转盘",
// mLotteryResult?.awardNum ?: 0
// )
// } else { // } else {
// MainDialog.receiveBox( // MainDialog.receiveBox(
// (context as Activity), // (context as Activity),
......
app/src/main/java/com/ym/game/view/TurntableUtils.kt
View file @ 2821a61a
...@@ -6,6 +6,7 @@ import android.animation.ObjectAnimator ...@@ -6,6 +6,7 @@ import android.animation.ObjectAnimator
import android.util.Log import android.util.Log
import android.view.animation.AccelerateDecelerateInterpolator import android.view.animation.AccelerateDecelerateInterpolator
import android.widget.ImageView import android.widget.ImageView
import com.ym.library.utils.LogUtils
import com.ym.task.module.listener.CustomAnimatiorListener import com.ym.task.module.listener.CustomAnimatiorListener
/** /**
...@@ -51,12 +52,13 @@ abstract class TurntableUtils { ...@@ -51,12 +52,13 @@ abstract class TurntableUtils {
} }
fun startAnim(type: Int, img: ImageView) { fun startAnim(type: Int, img: ImageView) {
LogUtils.e(TAG,"type="+type)
var num = type var num = type
if (type == 1) { if (type == 1) {
num = 0 num = 0
} else { } else {
if (start >= 60f) { if (start >= 45f) {
} else { } else {
num -= 1 num -= 1
...@@ -77,21 +79,22 @@ abstract class TurntableUtils { ...@@ -77,21 +79,22 @@ abstract class TurntableUtils {
// } // }
// //
// } // }
LogUtils.e(TAG,"num="+num)
end = (4 * 360f) - (num * 60f) end = (4 * 360f) - (num * 45f)
LogUtils.e(TAG,"end="+end)
objectAnimator1 = ObjectAnimator.ofFloat(img, "rotation", start, end).setDuration(3000) objectAnimator1 = ObjectAnimator.ofFloat(img, "rotation", start, end).setDuration(3000)
objectAnimator1?.addUpdateListener { objectAnimator1?.addUpdateListener {
val value = it.getAnimatedValue().toString().toFloat() val value = it.getAnimatedValue().toString().toFloat()
val a = (value / 360f).toInt() val a = (value / 360f).toInt()
val x = value - (a * 360f) val x = value - (a * 360f)
val n = (x / 120f).toInt() val n = (x /120f).toInt()
val z = x - (n * 120) val z = x - (n * 120)
// Log.d( // Log.d(
// TAG, // TAG,
// "value:" + value + " a:" + a + " x:" + x + " n:" + n + " z:" + z // "value:" + value + " a:" + a + " x:" + x + " n:" + n + " z:" + z
// ) // )
start = z // start = z
} }
// Log.d(TAG, " start:" + start + " end:" + end) // Log.d(TAG, " start:" + start + " end:" + end)
......
app/src/main/res/layout/dialog_get_water_drop.xml 0 → 100644
View file @ 2821a61a
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginTop="71dp"
android:layout_marginRight="18dp"
android:background="@mipmap/icon_main_dialog_get_drops_bg">
<LinearLayout
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:background="@mipmap/icon_content_bg"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_get_drop_bg"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_content_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_get_drop_bg2"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_content_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_get_drop_bg3"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/btn_get_drop_happy_accept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="28dp"
android:background="@mipmap/icon_main_turntable_free_draw"
android:gravity="center"
android:text="开心收下"
android:textColor="@color/white"
android:textSize="@dimen/sp_18" />
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@mipmap/icon_top_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_40"
android:text="恭喜获得"
android:textColor="@color/white"
android:textSize="30sp" />
<ImageView
android:id="@+id/lv_get_drop_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="16dp"
android:paddingRight="@dimen/dp_30"
android:src="@mipmap/icon_main_popup_close" />
</RelativeLayout>
<FrameLayout
android:id="@+id/layout_get_drop_ad"
android:layout_width="match_parent"
android:layout_height="265dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginRight="18dp"
android:visibility="gone" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="14dp"
android:src="@drawable/icon_main_dialog_see_details"
android:visibility="gone" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_layout_get_red_package.xml 0 → 100644
View file @ 2821a61a
<?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:textSize="24sp" />
</LinearLayout>
</LinearLayout>
app/src/main/res/layout/dialog_layout_open_box.xml 0 → 100644
View file @ 2821a61a
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="18dp"
android:layout_marginTop="71dp"
android:layout_marginRight="18dp"
android:background="@mipmap/icon_main_dialog_get_drops_bg">
<LinearLayout
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:background="@mipmap/icon_content_bg"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_get_drop_bg"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_content_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_get_drop_bg2"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
<LinearLayout
android:id="@+id/id_ll_content_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<ImageView
android:id="@+id/iv_get_drop_bg3"
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_70"
android:layout_gravity="center"
android:src="@mipmap/icon_coin" />
<TextView
android:id="@+id/tv_get_drop_count3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/color_7C1714"
android:textSize="18sp"
tools:text="+40g" />
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/btn_get_drop_happy_accept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/id_ll_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="20dp"
android:layout_marginBottom="28dp"
android:background="@mipmap/icon_main_turntable_free_draw"
android:gravity="center"
android:text="开心收下"
android:textColor="@color/white"
android:textSize="@dimen/sp_18" />
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@mipmap/icon_top_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/dp_40"
android:text="恭喜获得"
android:textColor="@color/white"
android:textSize="30sp" />
<ImageView
android:id="@+id/lv_get_drop_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="16dp"
android:paddingRight="@dimen/dp_30"
android:src="@mipmap/icon_main_popup_close" />
</RelativeLayout>
<FrameLayout
android:id="@+id/layout_get_drop_ad"
android:layout_width="match_parent"
android:layout_height="265dp"
android:layout_marginLeft="18dp"
android:layout_marginTop="10dp"
android:layout_marginRight="18dp"
android:visibility="gone" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="14dp"
android:src="@drawable/icon_main_dialog_see_details"
android:visibility="gone" />
</LinearLayout>
</FrameLayout>
\ No newline at end of file
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ 2821a61a
...@@ -254,5 +254,6 @@ public class NetConfig { ...@@ -254,5 +254,6 @@ public class NetConfig {
public static final String URL_GAME_INCR_SEED="app/v1/game/farm/incr_seed";//看视频获得种子 public static final String URL_GAME_INCR_SEED="app/v1/game/farm/incr_seed";//看视频获得种子
public static final String URL_GAME_INCR_ACCELERATORS="app/v1/game/farm/incr_accelerators";//看视频获得加速剂 public static final String URL_GAME_INCR_ACCELERATORS="app/v1/game/farm/incr_accelerators";//看视频获得加速剂
} }
} }
library/src/main/java/com/ym/library/utils/LogUtils.java
View file @ 2821a61a
...@@ -67,7 +67,7 @@ public final class LogUtils { ...@@ -67,7 +67,7 @@ public final class LogUtils {
private static String sDefaultDir;// log默认存储目录 private static String sDefaultDir;// log默认存储目录
private static String sDir; // log存储目录 private static String sDir; // log存储目录
private static String sFilePrefix = "util";// log文件前缀 private static String sFilePrefix = "util";// log文件前缀
private static boolean sLogSwitch = false; // log总开关，默认开 private static boolean sLogSwitch = true; // log总开关，默认开
private static boolean sLog2ConsoleSwitch = true; // logcat是否打印，默认打印 private static boolean sLog2ConsoleSwitch = true; // logcat是否打印，默认打印
private static String sGlobalTag = null; // log标签 private static String sGlobalTag = null; // log标签
private static boolean sTagIsSpace = true; // log标签是否为空白 private static boolean sTagIsSpace = true; // log标签是否为空白
......
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