Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
L
LuckyFarm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
LuckyFarm
Commits
31512e8c
Commit
31512e8c
authored
Oct 20, 2020
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改小问题
parent
ebb9a4a5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
14 deletions
+4
-14
GameActivity.kt
app/src/main/java/com/ym/game/GameActivity.kt
+1
-0
layout_popup_drops.xml
app/src/main/res/layout/layout_popup_drops.xml
+1
-2
CenterDialog.kt
library/src/main/java/com/ym/library/utils/CenterDialog.kt
+1
-11
icon_diamand.png
library/src/main/res/drawable-xhdpi/icon_diamand.png
+0
-0
dialog_get_water_drop.xml
library/src/main/res/layout/dialog_get_water_drop.xml
+1
-1
No files found.
app/src/main/java/com/ym/game/GameActivity.kt
View file @
31512e8c
...
...
@@ -521,6 +521,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
.
subscribe
(
object
:
BaseObserver
<
FlyBoxEntity
>()
{
override
fun
onSuccess
(
result
:
FlyBoxEntity
?)
{
Log
.
d
(
"wxw"
,
"看视频领取宝箱"
+
Utils
.
obj2Str
(
result
))
if
(
result
!=
null
)
{
var
type
=
result
.
type
if
(
type
!=
null
)
{
...
...
app/src/main/res/layout/layout_popup_drops.xml
View file @
31512e8c
...
...
@@ -62,7 +62,6 @@
android:id=
"@+id/recycler_popup_watering"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"24dp"
app:layoutManager=
"androidx.recyclerview.widget.LinearLayoutManager"
/>
</FrameLayout>
...
...
@@ -73,7 +72,7 @@
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_marginRight=
"
20
dp"
android:layout_marginRight=
"
15
dp"
android:src=
"@mipmap/icon_main_popup_close"
/>
<ImageView
...
...
library/src/main/java/com/ym/library/utils/CenterDialog.kt
View file @
31512e8c
...
...
@@ -344,18 +344,8 @@ object CenterDialog : BaseDialog() {
Gravity
.
CENTER
)
val
ivGetDropBg
=
mDialogView
?.
findViewById
<
ImageView
>(
R
.
id
.
iv_get_drop_bg
)
val
tvGetDropCount
=
mDialogView
?.
findViewById
<
TextView
>(
R
.
id
.
tv_get_drop_count
)
// ivGetDropLoght.animation = AnimationUtils.loadAnimation(context, R.anim.rotate_anim_lib)
if
(
type
==
1
)
{
tvGetDropCount
.
text
=
"+${rewardCount}g"
ivGetDropBg
.
setImageResource
(
R
.
drawable
.
icon_main_dialog_popupwater_icon_lib
)
}
else
if
(
type
==
2
)
{
tvGetDropCount
.
text
=
"+${rewardCount}"
// ivGetDropBg.setImageResource(R.drawable.icon_main_dialog_popupwater_coin_lib)
}
// ToponManager.loadNative((context as Activity),layoutAd,object : ToponNativeListener {
// override fun onAdImpressed(atAdInf: ATAdInfo) {
...
...
library/src/main/res/drawable-xhdpi/icon_diamand.png
0 → 100644
View file @
31512e8c
23.1 KB
library/src/main/res/layout/dialog_get_water_drop.xml
View file @
31512e8c
...
...
@@ -46,7 +46,7 @@
android:layout_width=
"80dp"
android:layout_height=
"80dp"
android:layout_gravity=
"center"
android:src=
"@drawable/icon_
coin
"
/>
android:src=
"@drawable/icon_
diamand
"
/>
<TextView
android:id=
"@+id/tv_get_drop_count"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment