Skip to content

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

修改弹窗显示2

parent 30162e14
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 181 deletions
app/src/main/java/com/ym/game/view/MainDialog.kt
View file @ e1bb25e9
......@@ -69,7 +69,7 @@ object MainDialog {
val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_get_diamand,
R.layout.dialog_get_water_drop,
context,
mDialog,
0,
......@@ -85,7 +85,7 @@ object MainDialog {
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)
var tvget = mDialogView?.findViewById<TextView>(R.id.id_tv_get)
val tvget = mDialogView?.findViewById<TextView>(R.id.id_tv_gongxi_get)
//3 种子 4 金币 5 加速剂
when (type) {
3 -> {
......@@ -224,7 +224,7 @@ object MainDialog {
val mDialog = Dialog(context, R.style.UpdateVersionCompatDialogTheme)
val mDialogView =
showBottomDialog(
R.layout.dialog_get_diamand,
R.layout.dialog_get_water_drop,
context,
mDialog,
0,
......@@ -241,7 +241,7 @@ object MainDialog {
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)
var tvget = mDialogView?.findViewById<TextView>(R.id.id_tv_get)
var tvget = mDialogView?.findViewById<TextView>(R.id.id_tv_gongxi_get)
//3 种子 4 金币 5 加速剂
when (type) {
1 -> {
......@@ -324,9 +324,11 @@ object MainDialog {
recyList?.adapter = orderListAdapter
recyList?.layoutManager = LinearLayoutManager(context)
orderListAdapter?.appendToList(str2Obj.farmOrderDataList)
val str2 = "完成当前订单将获得<font color=\"#FF9128\"><big><big>${str2Obj.awardCash}</big></big></font>元"
tvtitle.text =Html.fromHtml(str2)
mDialogView.findViewById<TextView>(R.id.id_img_order_list_title).text="未完成${str2Obj.orderLevel}级订单"
val str2 =
"完成当前订单将获得<font color=\"#FF9128\"><big><big>${str2Obj.awardCash}</big></big></font>元"
tvtitle.text = Html.fromHtml(str2)
mDialogView.findViewById<TextView>(R.id.id_img_order_list_title).text =
"未完成${str2Obj.orderLevel}级订单"
}
//shwoAd(adType, context, layoutAd)
......
app/src/main/res/layout/dialog_get_water_drop.xml
View file @ e1bb25e9
......@@ -136,7 +136,7 @@
android:src="@mipmap/icon_top_bg" />
<TextView
android:id="@+id/id_tv_get"
android:id="@+id/id_tv_gongxi_get"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
......
app/src/main/res/layout/dialog_layout_open_box.xml deleted 100644 → 0
View file @ 30162e14
<?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:paddingRight="@dimen/dp_20"
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
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