Skip to content

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

111

parent da0642fb
Show whitespace changes
Inline Side-by-side
Showing with 233 additions and 310 deletions
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt
View file @ 1124a0f5
......@@ -4,6 +4,7 @@ import android.content.Context
import android.text.Html
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
......@@ -174,6 +175,23 @@ class CashExchangeAdapter :
}
}
}
/**
* 添加点击缩放效果
*/
fun View.addClickScale(scale: Float = 0.9f, duration: Long = 150) {
this.setOnTouchListener { _, event ->
when (event.action) {
MotionEvent.ACTION_DOWN -> {
this.animate().scaleX(scale).scaleY(scale).setDuration(duration).start()
}
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
this.animate().scaleX(1f).scaleY(1f).setDuration(duration).start()
}
}
// 点击事件处理，交给View自身
this.onTouchEvent(event)
}
}
}
\ No newline at end of file
app/src/main/java/com/ym/game/adapter/SigninDropsAdapter.kt
View file @ 1124a0f5
......@@ -68,6 +68,7 @@ class SigninDropsAdapter :
holder.ivStatus.setImageResource(R.drawable.tab_1)
}
if (data.id == 7) {
holder.tvStatus.text = "???"
holder.ivStatus.setImageResource(R.drawable.tab_3)
}
}
......
app/src/main/res/layout/item_with_draw_list.xml
View file @ 1124a0f5
......@@ -5,11 +5,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/withdraw_bg"
android:padding="4dp"
android:orientation="horizontal">
android:orientation="horizontal"
android:padding="4dp">
<RelativeLayout
android:layout_width="70dp"
......@@ -17,11 +17,6 @@
<!-- android:src="@mipmap/icon_item_cash_bg"-->
<ImageView
android:id="@+id/id_img_icon"
android:layout_width="@dimen/dp_67"
......@@ -34,22 +29,21 @@
<ImageView
android:id="@+id/id_img_mark"
android:layout_width="46dp"
android:layout_marginTop="-10dp"
android:layout_centerHorizontal="true"
android:layout_below="@+id/id_img_icon"
android:layout_height="@dimen/dp_20"
android:layout_below="@+id/id_img_icon"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/dp_18"
android:layout_marginTop="-10dp"
android:layout_marginBottom="6dp"
android:src="@mipmap/icon_fuli" />
</RelativeLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
......@@ -58,18 +52,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="fdafas"
android:layout_marginBottom="@dimen/dp_5"
android:text="fdafas"
android:textColor="#642D2D"
android:textSize="14sp" />
android:textSize="12sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="20dp"
>
android:layout_marginRight="20dp">
<ProgressBar
android:id="@+id/progess_with_draw_item"
......@@ -84,7 +76,6 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginBottom="-3dp"
android:paddingRight="@dimen/dp_20"
android:textColor="@color/white"
android:textSize="10sp" />
</RelativeLayout>
......@@ -102,9 +93,9 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text=""
android:textStyle="bold"
android:textColor="#ED5430"
android:textSize="@dimen/sp_15" />
android:textSize="@dimen/sp_15"
android:textStyle="bold" />
<ImageView
android:id="@+id/id_img_duihuan"
......@@ -116,132 +107,129 @@
</LinearLayout>
<!--<?xml version="1.0" encoding="utf-8"?>-->
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
<!-- xmlns:tools="http://schemas.android.com/tools"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="4dp"-->
<!-- android:paddingRight="5dp"-->
<!-- android:orientation="horizontal">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:layout_height="70dp">-->
<!--&lt;!&ndash; android:src="@mipmap/icon_item_cash_bg"&ndash;&gt;-->
<!-- <ImageView-->
<!-- android:src="@drawable/withdraw_bg"-->
<!-- android:layout_width="match_parent"-->
<!-- android:scaleType="fitXY"-->
<!-- android:layout_height="wrap_content"/>-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_gravity="bottom"-->
<!-- android:layout_weight="1"-->
<!-- android:orientation="horizontal">-->
<!-- <LinearLayout-->
<!-- android:layout_width="68dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <ImageView-->
<!-- android:id="@+id/id_img_icon"-->
<!-- android:layout_width="@dimen/dp_67"-->
<!-- android:layout_height="@dimen/dp_36"-->
<!-- android:layout_marginLeft="2dp"-->
<!-- android:layout_marginTop="@dimen/dp_15"-->
<!-- android:src="@mipmap/baicai_fruit" />-->
<!-- <ImageView-->
<!-- android:id="@+id/id_img_mark"-->
<!-- android:layout_width="46dp"-->
<!-- android:layout_height="@dimen/dp_20"-->
<!-- android:layout_marginLeft="@dimen/dp_18"-->
<!-- android:layout_marginBottom="6dp"-->
<!-- android:src="@mipmap/icon_fuli" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- android:gravity="center"-->
<!-- android:layout_marginBottom="5dp"-->
<!-- android:orientation="vertical">-->
<!-- <TextView-->
<!-- android:id="@+id/id_tv_chazhi"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="left"-->
<!-- android:text="fdafas"-->
<!-- android:layout_marginLeft="@dimen/dp_20"-->
<!-- android:layout_marginBottom="@dimen/dp_5"-->
<!-- android:textColor="#642D2D"-->
<!-- android:textSize="11sp" />-->
<!-- <RelativeLayout-->
<!-- android:layout_width="150dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="@dimen/dp_10"-->
<!-- android:layout_marginRight="4dp">-->
<!-- <ProgressBar-->
<!-- android:id="@+id/progess_with_draw_item"-->
<!-- style="?android:attr/progressBarStyleHorizontal"-->
<!-- android:layout_width="150dp"-->
<!-- android:layout_height="12dp"-->
<!-- android:progressDrawable="@drawable/user_progressbar_bg" />-->
<!-- <TextView-->
<!-- android:id="@+id/id_tv_jindu"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:layout_marginBottom="-3dp"-->
<!-- android:paddingRight="@dimen/dp_20"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="10sp" />-->
<!-- </RelativeLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="68dp"-->
<!-- android:layout_marginLeft="-13dp"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical">-->
<!-- <TextView-->
<!-- android:id="@+id/id_tv_cash"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@mipmap/icon_iten_jiangjin_bg"-->
<!-- android:gravity="center"-->
<!-- android:text=""-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/sp_15" />-->
<!-- <ImageView-->
<!-- android:id="@+id/id_img_duihuan"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="-10dp"-->
<!-- android:src="@mipmap/icon_duihuan_check" />-->
<!-- </LinearLayout>-->
<!--</LinearLayout>-->
<!--<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
<!-- xmlns:tools="http://schemas.android.com/tools"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginBottom="4dp"-->
<!-- android:paddingRight="5dp"-->
<!-- android:orientation="horizontal">-->
<!-- <RelativeLayout-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_weight="1"-->
<!-- android:layout_height="70dp">-->
<!--&lt;!&ndash; android:src="@mipmap/icon_item_cash_bg"&ndash;&gt;-->
<!-- <ImageView-->
<!-- android:src="@drawable/withdraw_bg"-->
<!-- android:layout_width="match_parent"-->
<!-- android:scaleType="fitXY"-->
<!-- android:layout_height="wrap_content"/>-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_gravity="bottom"-->
<!-- android:layout_weight="1"-->
<!-- android:orientation="horizontal">-->
<!-- <LinearLayout-->
<!-- android:layout_width="68dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="vertical">-->
<!-- <ImageView-->
<!-- android:id="@+id/id_img_icon"-->
<!-- android:layout_width="@dimen/dp_67"-->
<!-- android:layout_height="@dimen/dp_36"-->
<!-- android:layout_marginLeft="2dp"-->
<!-- android:layout_marginTop="@dimen/dp_15"-->
<!-- android:src="@mipmap/baicai_fruit" />-->
<!-- <ImageView-->
<!-- android:id="@+id/id_img_mark"-->
<!-- android:layout_width="46dp"-->
<!-- android:layout_height="@dimen/dp_20"-->
<!-- android:layout_marginLeft="@dimen/dp_18"-->
<!-- android:layout_marginBottom="6dp"-->
<!-- android:src="@mipmap/icon_fuli" />-->
<!-- </LinearLayout>-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- android:gravity="center"-->
<!-- android:layout_marginBottom="5dp"-->
<!-- android:orientation="vertical">-->
<!-- <TextView-->
<!-- android:id="@+id/id_tv_chazhi"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="left"-->
<!-- android:text="fdafas"-->
<!-- android:layout_marginLeft="@dimen/dp_20"-->
<!-- android:layout_marginBottom="@dimen/dp_5"-->
<!-- android:textColor="#642D2D"-->
<!-- android:textSize="11sp" />-->
<!-- <RelativeLayout-->
<!-- android:layout_width="150dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginLeft="@dimen/dp_10"-->
<!-- android:layout_marginRight="4dp">-->
<!-- <ProgressBar-->
<!-- android:id="@+id/progess_with_draw_item"-->
<!-- style="?android:attr/progressBarStyleHorizontal"-->
<!-- android:layout_width="150dp"-->
<!-- android:layout_height="12dp"-->
<!-- android:progressDrawable="@drawable/user_progressbar_bg" />-->
<!-- <TextView-->
<!-- android:id="@+id/id_tv_jindu"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerInParent="true"-->
<!-- android:layout_marginBottom="-3dp"-->
<!-- android:paddingRight="@dimen/dp_20"-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="10sp" />-->
<!-- </RelativeLayout>-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<!-- </RelativeLayout>-->
<!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="68dp"-->
<!-- android:layout_marginLeft="-13dp"-->
<!-- android:gravity="center"-->
<!-- android:orientation="vertical">-->
<!-- <TextView-->
<!-- android:id="@+id/id_tv_cash"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:background="@mipmap/icon_iten_jiangjin_bg"-->
<!-- android:gravity="center"-->
<!-- android:text=""-->
<!-- android:textColor="@color/white"-->
<!-- android:textSize="@dimen/sp_15" />-->
<!-- <ImageView-->
<!-- android:id="@+id/id_img_duihuan"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginTop="-10dp"-->
<!-- android:src="@mipmap/icon_duihuan_check" />-->
<!-- </LinearLayout>-->
<!--</LinearLayout>-->
game/src/main/assets/bin/Data/sharedassets1.assets.split10
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split14
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split17
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split18
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split19
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split2
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split24
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split26
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split27
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split28
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split29
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split30
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split5
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
game/src/main/assets/bin/Data/sharedassets1.assets.split8
View file @ 1124a0f5
This source diff could not be displayed because it is too large. You can view the blob instead.
library/src/main/java/com/ym/library/net/NetConfig.java
View file @ 1124a0f5
......@@ -39,9 +39,9 @@ public class NetConfig {
BASE_URL = "https://api.zhangxinhulian.com/";
BASE_WEB_URL = "https://www.zhangxinhulian.com/";
BASE_NEW_URL = "http://newapi.zhangxinhulian.com/";
BASE_FEED_URL = "http://feedapi.zhangxinhulian.com/";
BASE_AD_URL = "https://bs.zhangxinhulian.com/";
URL_REPORT_BASE = "http://report.zhangxinhulian.com/";
BASE_FEED_URL = "https://fsapi.ihuomao.com/";
BASE_AD_URL = "https://bs.ihuomao.com/";
URL_REPORT_BASE = "https://report.ihuomao.com/";
break;
case TEST:
BASE_URL = "https://sandbox.zhangxinhulian.com/";
......
library/src/main/java/com/ym/library/utils/CenterDialog.kt
View file @ 1124a0f5
......@@ -88,7 +88,7 @@ object CenterDialog : BaseDialog() {
// val tv_money = mDialogView?.findViewById<TextView>(R.id.tv_money)
// tv_money.text = "${cashStr}元"
mDialogView.findViewById<ImageView>(R.id.id_iv_back).setOnClickListener {
mDialogView.findViewById<TextView>(R.id.id_tv_go_on_make_money).setOnClickListener {
webView?.loadUrl("javascript:onResume()")
mDialog.dismiss()
}
......
library/src/main/res/layout/dialog_lib_get_money.xml
View file @ 1124a0f5
......@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="44dp"
android:text="兑换成功"
android:text="提现成功"
android:textColor="@color/white"
android:textSize="20sp" />
......@@ -63,7 +63,6 @@
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"
......@@ -93,6 +92,7 @@
android:layout_marginBottom="20dp"
android:background="@drawable/dialog_draw_btn_select"
android:gravity="center"
android:text="继续赚钱"
android:textColor="@color/white"
android:textSize="20sp"
android:textStyle="bold" />
......
userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt
View file @ 1124a0f5
......@@ -40,7 +40,7 @@ class SettingActivity : BaseActivity() {
copy()
}
rl_back.setOnClickListener { finish() }
id_iv_back.setOnClickListener { finish() }
// id_iv_back.setOnClickListener { finish() }
// tv_user_toolbar_title.text = "设置"
//用户协议
tv_setting_user_agreement.setOnClickListener {
......
userinfo/src/main/res/layout/activity_setting.xml
View file @ 1124a0f5
......@@ -11,13 +11,6 @@
android:background="@drawable/rl_bg"
android:paddingTop="40dp">
<RelativeLayout
android:id="@+id/rl_back"
android:layout_width="100dp"
android:layout_height="50dp">
</RelativeLayout>
<ImageView
android:id="@+id/id_iv_back"
......@@ -61,7 +54,6 @@
android:layout_height="wrap_content"
android:layout_marginLeft="30dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="14dp"
android:background="@drawable/icon_setting_item_bg">
<TextView
......@@ -74,8 +66,7 @@
android:paddingBottom="20dp"
android:text="ID:1234567"
android:textColor="#642D2D"
android:textSize="15sp"
android:textStyle="bold" />
android:textSize="15sp" />
<ImageView
android:id="@+id/id_iv_copy"
......@@ -102,7 +93,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="300dp"
android:layout_marginLeft="30dp"
android:layout_marginRight="8dp"
android:background="@drawable/icon_ll_bg"
......@@ -113,7 +104,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingLeft="16dp"
android:paddingTop="30dp"
android:paddingTop="10dp"
android:paddingRight="20dp"
android:paddingBottom="10dp">
......@@ -230,7 +221,6 @@
android:paddingLeft="16dp"
android:paddingTop="10dp"
android:paddingRight="20dp"
android:paddingBottom="30dp"
android:text="@string/user_about_us"
android:textColor="#642D2D"
android:textSize="15sp" />
......@@ -252,6 +242,12 @@
android:gravity="center"
android:textColor="#ffffffff"
android:textSize="20sp" />
<RelativeLayout
android:id="@+id/rl_back"
android:layout_width="100dp"
android:layout_height="50dp"></RelativeLayout>
</RelativeLayout>
</RelativeLayout>
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