Skip to content

L
LuckyFarm
Commit da0642fb authored by erwin's avatar erwin
Browse files
Options

Merge remote-tracking branch 'origin/develop_babafarm_1.0.0' into develop_babafarm_1.0.0

parents b8c60edc 020bf373
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 59 deletions
app/src/main/java/com/ym/game/view/SpeedWaterPopupWindow.kt
View file @ da0642fb
...@@ -231,7 +231,7 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View, ...@@ -231,7 +231,7 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
.subscribe(object : BaseObserver<Any>() { .subscribe(object : BaseObserver<Any>() {
override fun onSuccess(result: Any?) { override fun onSuccess(result: Any?) {
Log.d("wxw", "看视频上报 Success") Log.d("wxw", "看视频上报 Success")
// mPresenter?.getRrchardDailyTask() mPresenter?.getAcceleratorsTask()
} }
override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) { override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
......
app/src/main/res/layout/item_watering_task.xml
View file @ da0642fb
...@@ -23,7 +23,8 @@ ...@@ -23,7 +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="17sp"
android:textStyle="bold"/>
<LinearLayout <LinearLayout
android:id="@+id/layout_watering_progress" android:id="@+id/layout_watering_progress"
......
game/src/main/assets/bin/Data/sharedassets1.assets.split18
View file @ da0642fb
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/jniLibs/armeabi-v7a/libMonoPosixHelper.so 100755 → 100644
View file @ da0642fb
File mode changed from 100755 to 100644
game/src/main/jniLibs/armeabi-v7a/libmain.so 100755 → 100644
View file @ da0642fb
No preview for this file type
game/src/main/jniLibs/armeabi-v7a/libmonobdwgc-2.0.so 100755 → 100644
View file @ da0642fb
File mode changed from 100755 to 100644
game/src/main/jniLibs/armeabi-v7a/libunity.so 100755 → 100644
View file @ da0642fb
No preview for this file type
game/src/main/jniLibs/x86/libMonoPosixHelper.so 100755 → 100644
View file @ da0642fb
File mode changed from 100755 to 100644
game/src/main/jniLibs/x86/libmain.so 100755 → 100644
View file @ da0642fb
No preview for this file type
game/src/main/jniLibs/x86/libmonobdwgc-2.0.so 100755 → 100644
View file @ da0642fb
File mode changed from 100755 to 100644
game/src/main/jniLibs/x86/libunity.so 100755 → 100644
View file @ da0642fb
No preview for this file type
library/src/main/java/com/ym/library/utils/CenterDialog.kt
View file @ da0642fb
...@@ -85,14 +85,14 @@ object CenterDialog : BaseDialog() { ...@@ -85,14 +85,14 @@ object CenterDialog : BaseDialog() {
0, 0,
Gravity.CENTER Gravity.CENTER
) )
val tv_money = mDialogView?.findViewById<TextView>(R.id.tv_money) // val tv_money = mDialogView?.findViewById<TextView>(R.id.tv_money)
tv_money.text = "${cashStr}元" // tv_money.text = "${cashStr}元"
mDialogView.findViewById<ImageView>(R.id.id_iv_back).setOnClickListener { mDialogView.findViewById<ImageView>(R.id.id_iv_back).setOnClickListener {
webView?.loadUrl("javascript:onResume()") webView?.loadUrl("javascript:onResume()")
mDialog.dismiss() mDialog.dismiss()
} }
mDialogView.findViewById<ImageView>(R.id.id_get_money_cancel).setOnClickListener { mDialogView.findViewById<ImageView>(R.id.id_img_dialog_close).setOnClickListener {
webView?.loadUrl("javascript:onResume()") webView?.loadUrl("javascript:onResume()")
mDialog.dismiss() mDialog.dismiss()
} }
......
library/src/main/res/drawable-xhdpi/dialog_draw_btn_select.xml 0 → 100644
View file @ da0642fb
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/icon_draw_check" android:state_pressed="false"/>
<item android:drawable="@drawable/icon_draw_press" android:state_pressed="true"/>
</selector>
\ No newline at end of file
library/src/main/res/layout/dialog_lib_get_money.xml
View file @ da0642fb
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/id_iv_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginTop="39dp"
android:layout_marginRight="28dp"
android:src="@drawable/icon_dialog_lib_get_money_cancel" />
<RelativeLayout <RelativeLayout
android:layout_width="320dp" android:layout_width="match_parent"
android:layout_height="360dp" android:layout_height="370dp"
android:layout_centerInParent="true" android:layout_marginLeft="15dp"
android:background="@drawable/bg_dialog_lib_get_money"> android:layout_marginRight="15dp">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="313dp"
android:layout_centerHorizontal="true" android:layout_alignParentBottom="true"
android:src="@drawable/icon_lib_get_money_title_acquire" /> android:scaleType="fitXY"
android:src="@drawable/icon_main_dialog_get_drops_bg" />
<TextView
android:id="@+id/tv_money"
android:layout_width="120dp"
android:layout_height="130dp"
android:layout_centerInParent="true"
android:background="@drawable/icon_dialog_lib_get_money_red_paper"
android:paddingLeft="25dp"
android:paddingTop="17dp"
android:text="0.3元"
android:textColor="#ffffffff"
android:textSize="20sp" />
<ImageView <ImageView
android:id="@+id/id_get_money_cancel" android:id="@+id/id_img_dialog_close"
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_marginTop="65dp"
android:src="@drawable/icon_new_close" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="350dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true" android:layout_marginLeft="10dp"
android:src="@drawable/icon_lib_get_money_btn_accept" /> android:layout_marginRight="10dp"
android:layout_marginBottom="20dp"
android:background="@drawable/icon_content_bg">
<ImageView
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_title"
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" />
<LinearLayout
android:id="@+id/id_ll_content"
android:layout_width="wrap_content"
android:layout_height="150dp"
android:layout_below="@+id/id_tv_gongxi_get"
android:layout_centerHorizontal="true"
android:layout_marginLeft="28dp"
android:layout_marginTop="121dp"
android:layout_marginRight="26dp"
android:gravity="center"
android:orientation="horizontal"
android:visibility="visible">
<TextView
android:id="@+id/id_tv_cash_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingExtra="10dp"
android:text="恭喜您成功兑换0.3元红包，您可以前往微信钱包查看到账情况"
android:textColor="#6A231A"
android:textSize="17sp"
android:visibility="visible" />
</LinearLayout>
<TextView
android:id="@+id/id_tv_go_on_make_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="20dp"
android:background="@drawable/dialog_draw_btn_select"
android:gravity="center"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </LinearLayout>
</FrameLayout>
</FrameLayout>
\ No newline at end of file
userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt
View file @ da0642fb
...@@ -39,6 +39,7 @@ class SettingActivity : BaseActivity() { ...@@ -39,6 +39,7 @@ class SettingActivity : BaseActivity() {
id_iv_copy.setOnClickListener { id_iv_copy.setOnClickListener {
copy() copy()
} }
rl_back.setOnClickListener { finish() }
id_iv_back.setOnClickListener { finish() } id_iv_back.setOnClickListener { finish() }
// tv_user_toolbar_title.text = "设置" // tv_user_toolbar_title.text = "设置"
//用户协议 //用户协议
......
userinfo/src/main/res/layout/activity_setting.xml
View file @ da0642fb
...@@ -11,6 +11,14 @@ ...@@ -11,6 +11,14 @@
android:background="@drawable/rl_bg" android:background="@drawable/rl_bg"
android:paddingTop="40dp"> android:paddingTop="40dp">
<RelativeLayout
android:id="@+id/rl_back"
android:layout_width="100dp"
android:layout_height="50dp">
</RelativeLayout>
<ImageView <ImageView
android:id="@+id/id_iv_back" android:id="@+id/id_iv_back"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -105,9 +113,9 @@ ...@@ -105,9 +113,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="40dp" android:paddingTop="30dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="20dp"> android:paddingBottom="10dp">
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
...@@ -137,9 +145,9 @@ ...@@ -137,9 +145,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableRight="@drawable/icon_setting_back" android:drawableRight="@drawable/icon_setting_back"
android:paddingLeft="20dp" android:paddingLeft="20dp"
android:paddingTop="20dp" android:paddingTop="10dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="20dp" android:paddingBottom="10dp"
android:visibility="gone" /> android:visibility="gone" />
<View <View
...@@ -156,9 +164,9 @@ ...@@ -156,9 +164,9 @@
android:drawableRight="@drawable/icon_setting_back" android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="20dp" android:paddingTop="10dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="20dp" android:paddingBottom="10dp"
android:text="检查更新" android:text="检查更新"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="15sp" android:textSize="15sp"
...@@ -178,9 +186,9 @@ ...@@ -178,9 +186,9 @@
android:drawableRight="@drawable/icon_setting_back" android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="20dp" android:paddingTop="10dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="20dp" android:paddingBottom="10dp"
android:text="@string/user_agreement" android:text="@string/user_agreement"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="15sp" /> android:textSize="15sp" />
...@@ -199,9 +207,9 @@ ...@@ -199,9 +207,9 @@
android:drawableRight="@drawable/icon_setting_back" android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="20dp" android:paddingTop="10dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="20dp" android:paddingBottom="10dp"
android:text="@string/user_privacy_policy" android:text="@string/user_privacy_policy"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="15sp" /> android:textSize="15sp" />
...@@ -220,9 +228,9 @@ ...@@ -220,9 +228,9 @@
android:drawableRight="@drawable/icon_setting_back" android:drawableRight="@drawable/icon_setting_back"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingTop="20dp" android:paddingTop="10dp"
android:paddingRight="20dp" android:paddingRight="20dp"
android:paddingBottom="40dp" android:paddingBottom="30dp"
android:text="@string/user_about_us" android:text="@string/user_about_us"
android:textColor="#642D2D" android:textColor="#642D2D"
android:textSize="15sp" /> android:textSize="15sp" />
......
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