From 1abc0ecc796eb5530f7936feb57f6dad79d8ba8a Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Tue, 26 Jun 2018 09:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV3.3-?= =?UTF-8?q?=E5=BC=80=E6=9C=8D=E8=A1=A8=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=B1=87=E6=80=BB=EF=BC=8820180625=EF=BC=89(=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E6=9C=8D=E6=B8=85=E7=A9=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20=E5=85=B6=E4=BD=99=E5=AE=8C=E6=88=90)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/databind/BindingAdapters.java | 10 ++-- .../gamedetail/GameDetailKaiFuAdapter.java | 51 +++++++++---------- .../kaifu/KaiFuWrapperFragment.java | 27 ++++++---- .../gamecenter/kaifu/add/AddKaiFuActivity.kt | 2 +- .../gamecenter/kaifu/add/AddKaiFuViewModel.kt | 3 +- .../kaifu/patch/PatchKaifuActivity.kt | 9 ++++ .../gh/gamecenter/manager/UserManager.java | 2 +- app/src/main/res/drawable/kaifu_hint.xml | 2 +- app/src/main/res/drawable/kaifu_item_hint.xml | 2 +- .../main/res/drawable/textview_orange_up.xml | 2 +- .../res/layout/fragment_kaifu_wrapper.xml | 32 ++++-------- .../res/layout/gamedetail_calendar_item.xml | 2 +- 12 files changed, 74 insertions(+), 70 deletions(-) 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 577be7a77a..43d9aa2dff 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -67,7 +67,7 @@ public class BindingAdapters { KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate); binding.setIsCloseBottom(i == list.size()); binding.setIsReadyPatch(isReadyPatch); - binding.getRoot().setClickable(isReadyPatch); + binding.getRoot().setEnabled(isReadyPatch); if (i == 0) { binding.setIsTitle(true); } else { @@ -99,14 +99,14 @@ public class BindingAdapters { if (hasFocus) { binding.kaifuAddName.setHint(""); } else { - binding.kaifuAddName.setHint("点击选择"); + binding.kaifuAddName.setHint("点击填写"); } }); binding.kaifuAddRemark.setOnFocusChangeListener((v, hasFocus) -> { if (hasFocus) { binding.kaifuAddRemark.setHint(""); } else { - binding.kaifuAddRemark.setHint("点击选择"); + binding.kaifuAddRemark.setHint("点击填写"); } }); } @@ -115,7 +115,7 @@ public class BindingAdapters { @BindingAdapter({"addKaiFuTime", "addKaiFuPosition"}) public static void addKaiFuTime(EditText view, Long time, Integer position) { if (time == 0) { - view.setText("点击选择"); + view.setHint("点击选择"); } else { String pattern; if (position == 0) { @@ -138,8 +138,10 @@ public class BindingAdapters { view.setHintTextColor(ContextCompat.getColor(view.getContext(), R.color.red)); } else if (position == 0) { view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.hint)); + view.setHintTextColor(ContextCompat.getColor(view.getContext(), R.color.hint)); } else { view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.title)); + view.setHintTextColor(ContextCompat.getColor(view.getContext(), R.color.hint)); } } 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 c89dae0dc8..c6c20beec4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailKaiFuAdapter.java @@ -59,7 +59,7 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { private int curWeek; private int curDay; - private boolean isNextMonth; + private boolean isNextMonth = true; // 初始化会调用setKaiFuTitle 也就是 isNextMonth默认是false private boolean isExistCurServer; //s 当月是否存在开服 private String suggestTime; @@ -88,7 +88,6 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { sp = PreferenceManager.getDefaultSharedPreferences(mContext); - isNextMonth = false; isExistCurServer = false; mCurDayData = new ArrayList<>(); @@ -96,7 +95,6 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { checkExistCurSerer(); initView(); - initDate(); } private void checkExistCurSerer() { @@ -150,36 +148,14 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { mBinding.kaifuNextMonth.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (!isNextMonth) { - mBinding.kaifuNextMonth.setBackgroundResource(R.drawable.calendar_bar_select); - mBinding.kaifuNextMonth.setTextColor(Color.WHITE); - mBinding.kaifuCurMonth.setBackgroundDrawable(new ColorDrawable(0)); - mBinding.kaifuCurMonth.setTextColor(Color.BLACK); - isNextMonth = true; - initDate(); - - if (mBinding.kaifuDetail.getVisibility() == View.VISIBLE) { - mBinding.kaifuDetail.setVisibility(View.GONE); - } - } + setKaiFuTitle(); } }); mBinding.kaifuCurMonth.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (isNextMonth) { - mBinding.kaifuNextMonth.setTextColor(Color.BLACK); - mBinding.kaifuNextMonth.setBackgroundDrawable(new ColorDrawable(0)); - mBinding.kaifuCurMonth.setTextColor(Color.WHITE); - mBinding.kaifuCurMonth.setBackgroundResource(R.drawable.calendar_bar_select); - isNextMonth = false; - initDate(); - - if (mBinding.kaifuDetail.getVisibility() == View.VISIBLE) { - mBinding.kaifuDetail.setVisibility(View.GONE); - } - } + setKaiFuTitle(); } }); @@ -216,6 +192,27 @@ public class GameDetailKaiFuAdapter extends BaseRecyclerAdapter { } } }); + + setKaiFuTitle(); + } + + void setKaiFuTitle() { + if (isNextMonth) { + mBinding.kaifuNextMonth.setTextColor(Color.BLACK); + mBinding.kaifuNextMonth.setBackgroundDrawable(new ColorDrawable(0)); + mBinding.kaifuCurMonth.setTextColor(Color.WHITE); + mBinding.kaifuCurMonth.setBackgroundResource(R.drawable.calendar_bar_select); + } else { + mBinding.kaifuNextMonth.setBackgroundResource(R.drawable.calendar_bar_select); + mBinding.kaifuNextMonth.setTextColor(Color.WHITE); + mBinding.kaifuCurMonth.setBackgroundDrawable(new ColorDrawable(0)); + mBinding.kaifuCurMonth.setTextColor(Color.BLACK); + } + isNextMonth = !isNextMonth; + if (mBinding.kaifuDetail.getVisibility() == View.VISIBLE) { + mBinding.kaifuDetail.setVisibility(View.GONE); + } + initDate(); } void showKaiFuDetail(boolean openKaiFuDetail) { diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java index 66f419c888..708dae8c42 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/kaifu/KaiFuWrapperFragment.java @@ -1,13 +1,12 @@ package com.gh.gamecenter.kaifu; -import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; import android.text.TextUtils; import android.view.MenuItem; import android.view.View; +import android.widget.ImageView; import android.widget.TextView; import com.gh.common.util.EntranceUtils; @@ -51,7 +50,7 @@ public class KaiFuWrapperFragment extends NormalFragment { @BindView(R.id.kaifu_skip_cur_time) View mSkipCurTime; @BindView(R.id.kaifu_skip_next_time) - TextView mSkipNextTime; + ImageView mSkipNextTime; private KaiFuFragment mKaiFuFragment; private KaiFuFragment mGameKaiFuFragment; @@ -94,10 +93,12 @@ public class KaiFuWrapperFragment extends NormalFragment { mKaiFuFragment = new KaiFuFragment(); Bundle args = new Bundle(); SimpleDateFormat format = new SimpleDateFormat("HH", Locale.CHINA); - args.putInt(KEY_INDEX_PAGE, Integer.valueOf(format.format(new Date(System.currentTimeMillis()))) > 18 ? 1 : -1); + args.putInt(KEY_INDEX_PAGE, Integer.valueOf(format.format(new Date(System.currentTimeMillis()))) >= 18 ? 1 : -1); mKaiFuFragment.setArguments(args); fragmentTransaction.add(R.id.layout_fragment_content, mKaiFuFragment); fragmentTransaction.commit(); + + mSkipNextTime.setTag(SHOW_NEXT_TIME); } private void resetFragment() { @@ -150,15 +151,19 @@ public class KaiFuWrapperFragment extends NormalFragment { } private void changeHintStyle(String status) { - Drawable drawable; +// Drawable drawable; if (status.equals(SHOW_LIST_TOP)) { - drawable = ContextCompat.getDrawable(getContext(), R.drawable.kaifu_hint_icon_up); + mSkipNextTime.setImageResource(R.drawable.kaifu_hint_icon_up); +// drawable = ContextCompat.getDrawable(getContext(), R.drawable.kaifu_hint_icon_up); } else { - drawable = ContextCompat.getDrawable(getContext(), R.drawable.kaifu_hint_icon_down); + mSkipNextTime.setImageResource(R.drawable.kaifu_hint_icon_down); +// drawable = ContextCompat.getDrawable(getContext(), R.drawable.kaifu_hint_icon_down); } - drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight()); - mSkipNextTime.setCompoundDrawables(null, null, drawable, null); - mSkipNextTime.setText(status); +// drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight()); +// mSkipNextTime.setCompoundDrawables(null, null, drawable, null); +// mSkipNextTime.setText(status); + + mSkipNextTime.setTag(status); } @Subscribe(threadMode = ThreadMode.MAIN) @@ -172,7 +177,7 @@ public class KaiFuWrapperFragment extends NormalFragment { @OnClick({R.id.kaifu_skip_next_time, R.id.kaifu_skip_cur_time}) public void onViewClick(View view) { if (view.getId() == R.id.kaifu_skip_next_time) { - EventBus.getDefault().post(new EBTypeChange(mSkipNextTime.getText().toString().equals(SHOW_LIST_TOP) + EventBus.getDefault().post(new EBTypeChange(mSkipNextTime.getTag().toString().equals(SHOW_LIST_TOP) ? SKIP_LIST_TOP : SKIP_NEXT_TIME, mGameKaiFuFragment != null && mGameKaiFuFragment.isVisible() ? CUR_GAME_KAIFU : CUR_ALL_KAIFU)); } else { diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt index 45ddd96aa1..7509f4f9f8 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuActivity.kt @@ -103,7 +103,7 @@ class AddKaiFuActivity : BaseActivity() { .setBgColor(Color.WHITE) .setDate(selectedDate) .setRangDate(startDate, endDate) - .setLabel("", "月", "日", "时", "分", "") + .setLabel("年", "月", "日", "时", "分", "") .isCenterLabel(false) .isDialog(true) .setContentTextSize(15) diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt index d93ffe9bb7..3f5da029af 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/add/AddKaiFuViewModel.kt @@ -29,7 +29,8 @@ class AddKaiFuViewModel(application: Application) : AndroidViewModel(application fun initData(entity: KaiFuCalendarEntity, allKaifuList: ArrayList, gameId: String) { mAllKaifuList = allKaifuList mGameId = gameId - entity.setNote(entity.getNote() + "+") // 第一条 添加+(号) + entity.setNote(entity.getNote() + " +") // 第一条 添加+(号) + if (entity.remark.isNullOrEmpty()) entity.remark = "-" calendarList.add(entity) for (i in 0 until 5) { calendarList.add(KaiFuCalendarEntity()) diff --git a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt index d49462dfd3..7856b53263 100644 --- a/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/kaifu/patch/PatchKaifuActivity.kt @@ -43,12 +43,21 @@ class PatchKaifuActivity : BaseActivity() { mBinding = ActivityKaifuPatchBinding.bind(mContentView) mBinding?.entity = mViewModel?.serverEntity + mBinding?.patchBtn?.isChecked = true mBinding?.patchBtn?.setOnCheckedChangeListener({ _, b: Boolean -> if (b) mBinding?.deleteBtn?.isChecked = false }) mBinding?.deleteBtn?.setOnCheckedChangeListener({ _, b: Boolean -> if (b) mBinding?.patchBtn?.isChecked = false }) + + mBinding?.patchRemark?.setOnFocusChangeListener({ v, hasFocus -> + if (hasFocus) { + mBinding?.patchRemark?.hint = "" + } else { + mBinding?.patchRemark?.hint = "点击填写" + } + }) mBinding?.patchPost?.setOnClickListener({ if (!mBinding?.deleteBtn?.isChecked!! == !mBinding?.patchBtn?.isChecked!!) { toast("请选择修改类型") diff --git a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java index 0a500beee6..2f3be05056 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UserManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UserManager.java @@ -155,7 +155,7 @@ public class UserManager { e.printStackTrace(); } mApiService - .refreshToken("tokens:refresh", body) + .refreshToken(BuildConfig.API_HOST + "tokens:refresh", body) .subscribe(new Response() { @Override public void onResponse(LoginTokenEntity response) { diff --git a/app/src/main/res/drawable/kaifu_hint.xml b/app/src/main/res/drawable/kaifu_hint.xml index 75f2165e48..d6358c08dc 100644 --- a/app/src/main/res/drawable/kaifu_hint.xml +++ b/app/src/main/res/drawable/kaifu_hint.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/kaifu_item_hint.xml b/app/src/main/res/drawable/kaifu_item_hint.xml index 63f0892116..d8586bc5ee 100644 --- a/app/src/main/res/drawable/kaifu_item_hint.xml +++ b/app/src/main/res/drawable/kaifu_item_hint.xml @@ -5,6 +5,6 @@ android:pivotX = "0%" android:pivotY = "0%" > - + \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_orange_up.xml b/app/src/main/res/drawable/textview_orange_up.xml index a48c01398f..d591552228 100644 --- a/app/src/main/res/drawable/textview_orange_up.xml +++ b/app/src/main/res/drawable/textview_orange_up.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/fragment_kaifu_wrapper.xml b/app/src/main/res/layout/fragment_kaifu_wrapper.xml index 931d6fa20a..b820fa97eb 100644 --- a/app/src/main/res/layout/fragment_kaifu_wrapper.xml +++ b/app/src/main/res/layout/fragment_kaifu_wrapper.xml @@ -17,34 +17,24 @@ android:layout_marginRight = "20dp" android:orientation = "vertical" > - - diff --git a/app/src/main/res/layout/gamedetail_calendar_item.xml b/app/src/main/res/layout/gamedetail_calendar_item.xml index a6323d8d58..5301daa67e 100644 --- a/app/src/main/res/layout/gamedetail_calendar_item.xml +++ b/app/src/main/res/layout/gamedetail_calendar_item.xml @@ -29,7 +29,7 @@