Skip to content

T
TangKuPos
Commit bbfc516e authored by 陈前's avatar 陈前
Browse files
Options

UI

parent ad3e5d4c
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 71 deletions
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ bbfc516e
......@@ -45,60 +45,60 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
mViewBinding.viewLine.setVisibility(View.GONE);
FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean b) {
if (b) {
if (mViewBinding.viewStub.isInflated()) {
mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
} else {
mViewBinding.viewStub.getViewStub().inflate();
ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
switch (v.getId()) {
case R.id.pay_cash:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
break;
case R.id.pay_alipay:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
break;
case R.id.pay_wechat:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
break;
case R.id.pay_bank:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
break;
case R.id.pay_vipcard:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
break;
case R.id.pay_tally:
mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
break;
}
}
});
}
} else {
mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
}
}
});
mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
hideSoftInput();
}
return false;
});
// mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
// @Override
// public void onFocusChange(View view, boolean b) {
// if (b) {
// if (mViewBinding.viewStub.isInflated()) {
// mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
// } else {
// mViewBinding.viewStub.getViewStub().inflate();
// ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
// viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// switch (v.getId()) {
// case R.id.pay_cash:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
// break;
// case R.id.pay_alipay:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
// break;
// case R.id.pay_wechat:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
// break;
// case R.id.pay_bank:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
// break;
// case R.id.pay_vipcard:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
// break;
// case R.id.pay_tally:
// mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
// break;
// }
//
//
// }
// });
// }
//
// } else {
// mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
// }
// }
// });
// mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
// if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
// mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
// hideSoftInput();
// }
//
// return false;
// });
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.tvTitle.setText("订单记录");
mViewBinding.icTitle.tvTitle.setText("订单列表");
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java
View file @ bbfc516e
......@@ -2,7 +2,13 @@ package com.xingdata.zzdpos.ui.statistics.fragment.order;
import android.content.Intent;
import android.databinding.DataBindingUtil;
import android.graphics.Typeface;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.view.KeyEvent;
import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
......@@ -11,7 +17,9 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
import com.xingdata.zzdpos.databinding.ItemStringBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
import com.xingdata.zzdpos.util.StringUtil;
......@@ -31,7 +39,7 @@ import io.reactivex.functions.Function;
import io.reactivex.schedulers.Schedulers;
public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrderMainBinding> {
public class OrderMainFragment extends BaseFragment<StatisticsPresenter, FragmentOrderMainBinding> {
private FragmentStateAdapter mFragmentStateAdapter;
private List<Long> dateLongs = new ArrayList<>();
......@@ -48,6 +56,15 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
Calendar calendar = Calendar.getInstance();
//获得当前时间的月份，月份从0开始所以结果要加1
month = calendar.get(Calendar.MONTH) + 1;
mViewBinding.edTitle.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
mPresenter.getSaleOrderList(1, mViewBinding.edTitle.getText().toString());
hideSoftInput();
}
return false;
});
initViewPager();
......@@ -104,36 +121,65 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
for (int i = 0; i < dateLongs.size() - 1; i++) {
fragments.add(new OrderListFragment().setDate(dateLongs.get(i), dateLongs.get(i + 1)));
}
initTab();
}
});
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
month--;
} else {
initTab();
}
}
});
} else {
private void initTab() {
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
if (mViewBinding.tabLayout.getSelectedTabPosition() != 0) {
new android.os.Handler().postDelayed(new Runnable() {
@Override
public void run() {
mViewBinding.viewPagerData.setCurrentItem(0, false);
}
}, 1);
}
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
View view = getLayoutInflater().inflate(R.layout.item_string, null);
ItemStringBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
if (i == 0) {
itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
}
itemMenuBottomBinding.itemTv.setText(month + "月");
itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
month--;
}
mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
......
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