Skip to content

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

黄军辉 

修改UI
parent 0dcc6f37
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 41 deletions
app/src/main/java/com/ym/game/adapter/CardLayoutManager.java 0 → 100644
View file @ f591743d
package com.ym.game.adapter;
import android.content.Context;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.ym.library.utils.Utils;
public class CardLayoutManager extends RecyclerView.LayoutManager {
@Override
public RecyclerView.LayoutParams generateDefaultLayoutParams() {
return new RecyclerView.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
}
@Override
public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
detachAndScrapAttachedViews(recycler);
int itemCount = getItemCount();
if (itemCount < 1) {
return;
}
//top-3View的position
int bottomPosition;
//边界处理
if (itemCount < 7) {
bottomPosition = 0;
} else {
bottomPosition = itemCount - 7;
}
//从可见的最底层View开始layout，依次层叠上去
for (int position = 0; position < itemCount; position++) {
View view = recycler.getViewForPosition(position);
addView(view);
measureChildWithMargins(view, 0, 0);
int widthSpace = getWidth() - getDecoratedMeasuredWidth(view);
int heightSpace = getHeight() - getDecoratedMeasuredHeight(view);
//我们在布局时，将childView居中处理，这里也可以改为只水平居中
layoutDecorated(view,0,0,widthSpace,heightSpace);
/**
* TopView的Scale 为1，translationY 0
* 每一级Scale相差0.05f，translationY相差7dp左右
*
* 观察人人影视的UI，拖动时，topView被拖动，Scale不变，一直为1.
* top-1View 的Scale慢慢变化至1，translation也慢慢恢复0
* top-2View的Scale慢慢变化至 top-1View的Scale，translation 也慢慢变化只top-1View的translation
* top-3View的Scale要变化，translation岿然不动
*/
//第几层,举例子，count =7， 最后一个TopView（6）是第0层，
int level = itemCount - position - 1;
//除了顶层不需要缩小和位移
if (level > 0 /*&& level < mShowCount - 1*/) {
//每一层都需要X方向的缩小
view.setScaleX(1 - 0.05f * level);
//前N层，依次向下位移和Y方向的缩小
if (level < 7 - 1) {
// view.setTranslationY(CardConfig.TRANS_Y_GAP * level);
view.setScaleY(1 - 0.05f * level);
} else {//第N层在 向下位移和Y方向的缩小的成都与 N-1层保持一致
// view.setTranslationY(CardConfig.TRANS_Y_GAP * (level - 1));
view.setScaleY(1 - 0.05f * (level - 1));
}
}
}
}
}
app/src/main/java/com/ym/game/adapter/CashExchangeAdapter.kt
View file @ f591743d
......@@ -68,7 +68,7 @@ class CashExchangeAdapter :
RxBusUtil.getDefault()
.send(RxBusConstant.RX_WITH_DRAW_LIST)
if (result != null) {
MainDialog.showWithDraw(
MainDialog?.showWithDraw(
mContext,
result.status,
result.reason,
......
app/src/main/java/com/ym/game/adapter/SigninDropsAdapter.kt
View file @ f591743d
package com.ym.game.adapter
import android.content.Context
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView
import androidx.recyclerview.widget.RecyclerView
import btmsdkobf.el
import com.ym.game.module.SinginEntity
import com.ym.library.base.BaseRecyclerAdapter
import com.ym.ddcy.R
import com.ym.library.AppliContext
import com.ym.library.utils.PhoneUtils
import com.ym.library.utils.Utils
import org.apache.poi.hslf.model.Line
import kotlin.math.log
/**
*Craeted by ${junqi.li}
......@@ -27,7 +36,27 @@ class SigninDropsAdapter :
return mList.size
}
override fun onBindViewHolder(holder: SigninDropsHolder, position: Int) {
// val layoutParams = holder.tvDay.layoutParams as LinearLayout.LayoutParams
//
// val screenWidth = PhoneUtils.getScreenWidth(AppliContext.get())-Utils.dip2px(66)
//
// val i = (screenWidth -Utils.dip2px(10))/7
// if(position==mList.size-1){
// layoutParams.width = i+Utils.dip2px(20)
// }else{
// layoutParams.width = i
// }
// Log.e("huang","screenWidth: "+screenWidth + " width: "+(i-Utils.dip2px(10)))
//
// holder.tvDay.layoutParams = layoutParams
//
// Log.e("huang","screenWidth: "+layoutParams.width)
if (mList.size > 0) {
val data = mList[position]
holder.tvDay.text = "第${data.id}天"
......@@ -43,12 +72,15 @@ class SigninDropsAdapter :
}
}
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SigninDropsHolder {
return SigninDropsHolder(
LayoutInflater.from(mContext).inflate(R.layout.item_signin_drops, parent, false)
)
}
inner class SigninDropsHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
......
app/src/main/java/com/ym/game/view/SiginDropsPopupwindow.kt
View file @ f591743d
......@@ -11,6 +11,7 @@ import android.widget.PopupWindow
import android.widget.RelativeLayout
import android.widget.TextView
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.ym.cms.listener.OnRecycleItemClickListener
import com.ym.game.listener.IDialogViewCloseCallback
......@@ -38,6 +39,7 @@ import com.ym.library.utils.EventUtils
import com.ym.library.utils.JumpUtils
import com.ym.library.utils.LogUtils
import com.ym.ddcy.R
import com.ym.game.adapter.CardLayoutManager
/**
*Craeted by ${junqi.li}
......@@ -90,7 +92,8 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
singinDropsAdapter = SigninDropsAdapter(mContext)
recyclerSigninDrops?.layoutManager =
GridLayoutManager(mContext, 7) as RecyclerView.LayoutManager
GridLayoutManager(mContext,7)
// recyclerSigninDrops?.layoutManager = CardLayoutManager()
recyclerSigninDrops?.adapter = singinDropsAdapter
wateringTaskAdpater = WateringTaskAdpater(mContext, 1, this)
......
app/src/main/res/layout/item_layout_record.xml
View file @ f591743d
......@@ -21,7 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_26"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_15"
android:includeFontPadding="false"
android:text="新手专享提现"
android:textColor="#642D2D"
......
app/src/main/res/layout/item_signin_drops.xml
View file @ f591743d
......@@ -2,39 +2,51 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="-8dp"
android:gravity="center_horizontal"
android:orientation="vertical">
<RelativeLayout
android:layout_width="@dimen/dp_70"
android:layout_height="@dimen/dp_74">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_root"
android:layout_width="70dp"
android:layout_height="@dimen/dp_74">
<ImageView
android:id="@+id/iv_item_signin_status"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@mipmap/icon_main_popup_singnin_received" />
<ImageView
android:id="@+id/iv_item_signin_status"
android:layout_width="100dp"
android:layout_height="match_parent"
android:src="@mipmap/icon_main_popup_singnin_received" />
<TextView
android:id="@+id/tv_item_signin_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_11"
android:text="60g"
android:textColor="#642D2D"
android:textSize="10sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_item_signin_status"
android:id="@+id/tv_item_signin_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="@dimen/dp_11"
android:text="60g"
android:textColor="#642D2D"
android:textSize="10sp" />
</RelativeLayout>
<TextView
android:id="@+id/tv_item_signin_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="第N天"
android:textColor="#826033"
android:textSize="12.5sp" />
android:layout_below="@+id/rl_root"
android:layout_gravity="center_horizontal"
android:layout_marginTop="6dp"
android:text="第N天"
android:textColor="#826033"
android:textSize="12.5sp" />
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_watering_task.xml
View file @ f591743d
......@@ -22,7 +22,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_15"
android:includeFontPadding="false"
android:text="浇水10次"
android:textColor="#642D2D"
......
app/src/main/res/layout/item_with_draw_list.xml
View file @ f591743d
......@@ -4,22 +4,31 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_15"
android:layout_marginBottom="4dp"
android:paddingRight="5dp"
android:orientation="horizontal">
<LinearLayout
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_height="70dp">
<ImageView
android:src="@mipmap/icon_item_cash_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_marginBottom="-8dp"
android:layout_weight="1"
android:background="@mipmap/icon_item_cash_bg"
android:orientation="horizontal">
<LinearLayout
android:layout_width="68dp"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<ImageView
......@@ -27,6 +36,7 @@
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" />
......@@ -43,6 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:layout_marginBottom="5dp"
android:orientation="vertical">
<TextView
......@@ -50,6 +61,7 @@
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"
......@@ -81,13 +93,14 @@
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:layout_marginLeft="-18dp"
android:layout_height="68dp"
android:layout_marginLeft="-13dp"
android:gravity="center"
android:layout_marginBottom="7dp"
android:orientation="vertical">
<TextView
......
build.gradle
View file @ f591743d
......@@ -25,6 +25,9 @@ allprojects {
maven {
url "http://47.97.184.214:8081/nexus/content/groups/public"
}
maven {
url "http://test.vlion.cn:8081/nexus/content/repositories/inland/"
}
}
}
......
library/build.gradle
View file @ f591743d
......@@ -92,7 +92,7 @@ dependencies {
api 'com.tencent.bugly:crashreport:latest.release'
api 'com.tencent.bugly:nativecrashreport:latest.release'
api('cn.vlion.inland:inlandmix:9.8.3') {
api('cn.vlion.inland:inlandmix:9.8.5') {
exclude group: 'cn.vlion.inland', module: 'inlandb'
exclude group: 'cn.vlion.inland', module: 'inlandg'
exclude group: 'cn.vlion.inland', module: 'inlands'
......
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