From e1dcd72a7957b25038e00a79a6f08dd5a2c8dad9 Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Fri, 1 Jun 2018 15:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=BC=80=E6=9C=8D=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/databind/BindingAdapters.java | 14 +++++- .../gamedetail/GameDetailKaiFuAdapter.java | 43 ++++--------------- .../main/res/drawable/textview_orange_bg.xml | 9 ++++ .../main/res/drawable/textview_yellow_bg.xml | 9 ++++ 4 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 app/src/main/res/drawable/textview_orange_bg.xml create mode 100644 app/src/main/res/drawable/textview_yellow_bg.xml diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 9a4e4c07b7..e3fd49a2ec 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -5,6 +5,7 @@ import android.databinding.BindingAdapter; import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.LayoutInflater; +import android.view.MotionEvent; import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; @@ -31,11 +32,14 @@ import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.entity.KaiFuCalendarEntity; +import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.manager.PackageManager; import com.lightgame.download.DownloadEntity; import com.lightgame.download.FileUtils; import com.lightgame.utils.Utils; +import org.greenrobot.eventbus.EventBus; + import java.text.SimpleDateFormat; import java.util.List; import java.util.Locale; @@ -68,7 +72,15 @@ public class BindingAdapters { binding.setEntity(serverEntity); binding.getRoot().setOnClickListener(v -> { listener.onClick(v, isReadyPatch != null && isReadyPatch ? serverEntity : null); -// mContext.startActivity(PatchKaifuActivity.Companion.getIntent(view.getContext(), serverEntity, mGameEntity.getId())); + }); + // 滑动冲突处理 + binding.getRoot().setOnTouchListener((v, event) -> { + if (event.getAction() == MotionEvent.ACTION_DOWN) { + EventBus.getDefault().post(new EBReuse("CalenderDown")); + } else if (event.getAction() == MotionEvent.ACTION_UP || event.getAction() == MotionEvent.ACTION_CANCEL) { + EventBus.getDefault().post(new EBReuse("CalenderCancel")); + } + return false; }); } view.addView(inflate); diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java index 41960cae86..b6bc4a5d28 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -215,19 +215,6 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { } } }); - - // 滑动冲突处理 - mBinding.kaifuDetailSv.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_DOWN) { - EventBus.getDefault().post(new EBReuse("CalenderDown")); - } else if (event.getAction() == MotionEvent.ACTION_UP) { - EventBus.getDefault().post(new EBReuse("CalenderCancel")); - } - return false; - } - }); } private void showKaiFuDetail(boolean openKaiFuDetail) { @@ -405,29 +392,17 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { int padd = DisplayUtils.dip2px(mContext, 2); viewHolder.calendarKaifu.setPadding(padd, DisplayUtils.dip2px(mContext, 1), padd, padd); - - // todo 颜色配置 - if (day < curDay && !isNextMonth) { - String remark = null; - for (KaiFuCalendarEntity calendarEntity : calendarServer) { - if (!TextUtils.isEmpty(calendarEntity.getRemark())) { - remark = calendarEntity.getRemark(); - break; - } + String remark = null; + for (KaiFuCalendarEntity calendarEntity : calendarServer) { + if (!TextUtils.isEmpty(calendarEntity.getRemark())) { + remark = calendarEntity.getRemark(); + break; } - viewHolder.calendarKaifu.setBackgroundResource(R.drawable.textview_b3b3b3_bg); - viewHolder.calendarKaifu.setText(TextUtils.isEmpty(remark) ? "新服×" + calendarServer.size() : remark); - } else { - String remark = null; - for (KaiFuCalendarEntity calendarEntity : calendarServer) { - if (!TextUtils.isEmpty(calendarEntity.getRemark())) { - remark = calendarEntity.getRemark(); - break; - } - } - viewHolder.calendarKaifu.setBackgroundResource(R.drawable.textview_b3b3b3_bg); - viewHolder.calendarKaifu.setText(TextUtils.isEmpty(remark) ? "新服×" + calendarServer.size() : remark); } + viewHolder.calendarKaifu.setBackgroundResource(R.drawable.textview_b3b3b3_bg); + viewHolder.calendarKaifu.setBackgroundResource(TextUtils.isEmpty(remark) + ? R.drawable.textview_yellow_bg : R.drawable.textview_orange_bg); + viewHolder.calendarKaifu.setText(TextUtils.isEmpty(remark) ? "新服×" + calendarServer.size() : remark); holder.itemView.setEnabled(true); holder.itemView.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/drawable/textview_orange_bg.xml b/app/src/main/res/drawable/textview_orange_bg.xml new file mode 100644 index 0000000000..d591552228 --- /dev/null +++ b/app/src/main/res/drawable/textview_orange_bg.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_yellow_bg.xml b/app/src/main/res/drawable/textview_yellow_bg.xml new file mode 100644 index 0000000000..832191c215 --- /dev/null +++ b/app/src/main/res/drawable/textview_yellow_bg.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file