Skip to content

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

UI

parent 23b8f82a
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 17 deletions
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/RechargeSearchFragment.java
View file @ 02541204
......@@ -8,6 +8,7 @@ import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.SectionEntity;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
......@@ -19,6 +20,8 @@ import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeGroupAdapter;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import com.xingdata.zzdpos.util.StatisticsCallback;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
......@@ -50,7 +53,6 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
@Override
public void initView() {
if (mStatisticsAdapter == null) {
mStatisticsAdapter = new StatisticsRechargeGroupAdapter(new ArrayList<>());
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
......@@ -59,6 +61,17 @@ public class RechargeSearchFragment extends BaseFragment<StatisticsPresenter, Fr
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
}
mViewBinding.statisticsRecycler.addItemDecoration(
new RecyclerViewUtil.StatisticsItemDecoration(getActivity(), 2, getResources().getColor(R.color.gray_kongming), new StatisticsCallback() {
@Override
public SectionEntity getItem(int position) {
if (position<mStatisticsAdapter.getData().size()){
return mStatisticsAdapter.getData().get(position);
}else {
return null;
}
}
}));
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
if (VipRechargeOrders != null) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/TicketSearchFragment.java
View file @ 02541204
......@@ -8,6 +8,7 @@ import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.SectionEntity;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderSearchBinding;
......@@ -18,6 +19,8 @@ import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsRechargeAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsTicketGroupAdapter;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import com.xingdata.zzdpos.util.StatisticsCallback;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
......@@ -59,6 +62,17 @@ public class TicketSearchFragment extends BaseFragment<StatisticsPresenter, Frag
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
}
mViewBinding.statisticsRecycler.addItemDecoration(
new RecyclerViewUtil.StatisticsItemDecoration(getActivity(), 2, getResources().getColor(R.color.gray_kongming), new StatisticsCallback() {
@Override
public SectionEntity getItem(int position) {
if (position<mStatisticsAdapter.getData().size()){
return mStatisticsAdapter.getData().get(position);
}else {
return null;
}
}
}));
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
if (Tickets != null) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java
View file @ 02541204
......@@ -55,6 +55,7 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
@Override
public void initView() {
mViewBinding.edTitle.setText("");
Calendar calendar = Calendar.getInstance();
//获得当前时间的月份，月份从0开始所以结果要加1
month = calendar.get(Calendar.MONTH) + 1;
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderSearchFragment.java
View file @ 02541204
......@@ -8,6 +8,7 @@ import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.entity.SectionEntity;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -19,6 +20,8 @@ import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderAdapter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsOrderGroupAdapter;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import com.xingdata.zzdpos.util.StatisticsCallback;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat;
......@@ -63,6 +66,17 @@ public class OrderSearchFragment extends BaseFragment<StatisticsPresenter, Fragm
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
}
mViewBinding.statisticsRecycler.addItemDecoration(
new RecyclerViewUtil.StatisticsItemDecoration(getActivity(), 2, getResources().getColor(R.color.gray_kongming), new StatisticsCallback() {
@Override
public SectionEntity getItem(int position) {
if (position<mStatisticsAdapter.getData().size()){
return mStatisticsAdapter.getData().get(position);
}else {
return null;
}
}
}));
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
if (saleorders != null) {
......
app/src/main/res/layout/fragment_order_search.xml
View file @ 02541204
<layout>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
......@@ -13,8 +13,10 @@
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_product"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="-1dp"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -31,5 +33,5 @@
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.constraint.ConstraintLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_marketing_menu.xml
View file @ 02541204
......@@ -2,10 +2,12 @@
<layout>
<data>
<import type="android.view.View"/>
<import type="android.view.View" />
<variable
name="isShow"
type="Boolean"/>
type="Boolean" />
</data>
......@@ -53,33 +55,33 @@
</LinearLayout>
<TextView
android:visibility="@{isShow? View.VISIBLE: View.GONE}"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv"
android:textColor="@color/red_guanyu"
android:text="高级功能"
android:layout_marginEnd="@dimen/all_margin"
android:layout_centerVertical="true"
android:textSize="@dimen/all_text_size_small"
android:paddingTop="@dimen/dp_4"
android:layout_marginEnd="@dimen/all_margin"
android:layout_toLeftOf="@+id/iv"
android:background="@drawable/red_border_thr_bigradius"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:background="@drawable/red_border_thr_bigradius"/>
android:paddingTop="@dimen/dp_4"
android:text="高级功能"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size_small"
android:visibility="@{isShow? View.VISIBLE: View.GONE}" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_alignParentTop="true"
android:background="@color/gray_kongming" />
android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_alignParentBottom="true"
android:background="@color/gray_kongming" />
android:background="@color/gray_huanggai" />
</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