Skip to content

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

111

parent da0642fb
Expand all Hide 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)
}
}
......
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,8 +88,8 @@ 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 {
webView?.loadUrl("javascript:onResume()")
mDialogView.findViewById<TextView>(R.id.id_tv_go_on_make_money).setOnClickListener {
webView?.loadUrl("javascript:onResume()")
mDialog.dismiss()
}
mDialogView.findViewById<ImageView>(R.id.id_img_dialog_close).setOnClickListener {
......
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