Skip to content

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

统计订单~~

parent 07b4b57f
Show whitespace changes
Inline Side-by-side
Showing with 374 additions and 146 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ ae4a2d6f
......@@ -123,6 +123,10 @@ public class C {
* 订单查询
*/
public static final String getSaleOrder = PKG + "saleorder/queryMis";
/**
* 订单列表查询
*/
public static final String queryOrderList = PKG + "saleorder/query";
/**
* 销售订单详情查询
*/
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ ae4a2d6f
......@@ -247,6 +247,22 @@ public final class ApiFactory {
.observeOn(AndroidSchedulers.mainThread());
}
/**
* 销售订单查询接口
*
* @param pageNulmber
* @param pageSize
* @return
*/
public static Observable<Pager<com.xingdata.zzdpos.model.Saleorder>> getSaleOrderList(int pageNulmber, int
pageSize,long startDate,long endDate) {
return Api.getInstance().service.getSaleOrder(pageNulmber, pageSize, startDate,
endDate).onErrorReturn(new
ErrorFilter<>()).map(new ResultFilter<>()).subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread());
}
/**
* 获取订单详情
*
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ ae4a2d6f
......@@ -134,6 +134,10 @@ interface ApiService {
@Query
("wd") String wd);
@POST(C.URL.ORDER.queryOrderList)
Observable<HttpMessage<Pager<Saleorder>>> getSaleOrder(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long endDate);
@POST(C.URL.ORDER.getOrderDetail)
Observable<HttpMessage<Saleorder>> getOrderDetail(@Query("id") String orderId);
......
app/src/main/java/com/xingdata/zzdpos/ui/main/adapter/MenuRecyclerAdapter.java
View file @ ae4a2d6f
......@@ -53,6 +53,14 @@ public class MenuRecyclerAdapter extends BaseAdapter<Integer, ItemMenuDetailBind
titleId = R.string.menu_manager;
imgId = R.mipmap.icon_administer;
break;
case C.MENU.MENU_STATISTICS_ORDER://订单
titleId = R.string.statistics_menu_order;
imgId = R.mipmap.icon_order;
break;
case C.MENU.MENU_STATISTICS_MS://营销
titleId = R.string.statistics_menu_ms;
imgId = R.mipmap.icon_record;
break;
}
mViewBinding.text.setText(titleId);
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java
View file @ ae4a2d6f
......@@ -7,6 +7,8 @@ import com.blankj.utilcode.util.FragmentUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityStatisticsBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.fragment.OrderMainFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
......@@ -33,6 +35,7 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
// if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsContract.java
View file @ ae4a2d6f
......@@ -2,6 +2,9 @@ package com.xingdata.zzdpos.ui.statistics;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.fragment.OrderListFragment;
/**
* Created by Administrator on 2017/12/23.
......@@ -10,12 +13,24 @@ import com.xingdata.zzdpos.base.BaseView;
public interface StatisticsContract {
interface View extends BaseView {
/**
* 跳转订单列表页
*/
void showOrderListFragment();
}
abstract class Presenter extends BasePresenter<View> {
/**
* 跳转订单列表页
*/
public abstract void clickOrderList();
/**
* 获取订单列表
*/
public abstract void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment orderListFragment);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ ae4a2d6f
......@@ -4,6 +4,9 @@ package com.xingdata.zzdpos.ui.statistics;
import android.view.KeyEvent;
import com.blankj.utilcode.util.FragmentUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.ui.statistics.fragment.OrderListFragment;
/**
* Created by Administrator on 2017/12/23.
......@@ -11,6 +14,7 @@ import com.blankj.utilcode.util.FragmentUtils;
public class StatisticsPresenter extends StatisticsContract.Presenter {
private int pageSize=20;
@Override
public void onAttached() {
......@@ -23,4 +27,19 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
}
@Override
public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
ApiFactory.Test.getSaleOrderList(pageNumber, pageSize, startDate, endDate).doFinally(() -> {
})
.subscribe(orderlist -> {
fragment.setData(orderlist,orderlist.isFirstPage());
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
public void getOrderList(int pageNumber, long startDate, long endDate,OrderListFragment fragment) {
getOrderList(pageNumber,pageSize,startDate,endDate,fragment);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsAdapter.java 0 → 100644
View file @ ae4a2d6f
package com.xingdata.zzdpos.ui.statistics.adapter;
import android.graphics.drawable.Drawable;
import android.support.annotation.Nullable;
import android.view.View;
import android.view.ViewGroup;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemStatisticsBinding;
import com.xingdata.zzdpos.model.Saleorder;
import java.util.List;
public class StatisticsAdapter extends BaseAdapter<Saleorder, ItemStatisticsBinding> {
public StatisticsAdapter(@Nullable List<Saleorder> data) {
super(R.layout.item_statistics, data);
}
@Override
protected void convert(ItemStatisticsBinding mViewBinding, Saleorder item) {
mViewBinding.tvLeftTop.setText(item.getOrderNo());
mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
}
@Override
protected View getItemView(int layoutResId, ViewGroup parent) {
return super.getItemView(layoutResId, parent);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/OrderListFragment.java
View file @ ae4a2d6f
package com.xingdata.zzdpos.ui.statistics.fragment;
import com.blankj.utilcode.util.TimeUtils;
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentOrderListBinding;
import com.xingdata.zzdpos.databinding.FragmentOrderMainBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.ui.statistics.StatisticsPresenter;
import com.xingdata.zzdpos.ui.statistics.adapter.StatisticsAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
public class OrderListFragment extends BaseFragment<MainPresenter, FragmentOrderListBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
public class OrderListFragment extends BaseFragment<StatisticsPresenter, FragmentOrderListBinding> {
private StatisticsAdapter mStatisticsAdapter;
private List<Saleorder> saleorders = new ArrayList<>();
private Long monthDateStart;
private Long monthDateEnd;
private int pagerNum = 1;
public OrderListFragment setDate(Long end, Long start) {
monthDateStart = start;
......@@ -43,52 +56,65 @@ public class OrderListFragment extends BaseFragment<MainPresenter, FragmentOrder
} else {
mViewBinding.setMonth(monthStart + "月");
}
mViewBinding.setAmt("收入：￥230.00");
mViewBinding.llTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
mViewBinding.tvEmpty.setText(R.string.statistics_search_empty);
if (mStatisticsAdapter == null) {
mStatisticsAdapter = new StatisticsAdapter(saleorders);
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
mViewBinding.setAmt("收入：￥230.00");
// mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// getActivity().finish();
// }
// });
// mViewBinding.icTitle.tvTitle.setText(R.string.menu_statistics);
// mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
// integers = new ArrayList<>();
// integers.add(101);
// integers.add(102);
// mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
// mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
// mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
// mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// switch ((int) adapter.getData().get(position)) {
// case C.MENU.MENU_VIP://会员
//
// break;
// case C.MENU.MENU_RECHARGE://充值
//
// break;
// case C.MENU.MENU_MS://营销
//
// break;
// case C.MENU.MENU_TICKET://优惠券
//
// break;
// case C.MENU.MENU_STATISTICS://统计
//
// break;
// case C.MENU.MENU_MANAGER://管理
//
// break;
//
// }
// }
// });
} else {
mViewBinding.statisticsRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.statisticsRecycler.setAdapter(mStatisticsAdapter);
}
mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
mStatisticsAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
}
private void onRefresh() {
pagerNum = 1;
mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
}
private void onLoadMore() {
pagerNum++;
mPresenter.getOrderList(pagerNum, monthDateStart, monthDateEnd, this);
}
/**
* 设置数据
*
* @param pager 数据
* @param isRefresh 是否刷新
*/
public void setData(Pager<Saleorder> pager, boolean isRefresh) {
if (isRefresh) {
mStatisticsAdapter.setEnableLoadMore(true);
mViewBinding.srlProduct.setRefreshing(false);
}
if (isRefresh) mStatisticsAdapter.setNewData(pager.getList());
else if (pager.getList().size() > 0) mStatisticsAdapter.addData(pager.getList());
if (pager.isLastPage()) mStatisticsAdapter.loadMoreEnd(isRefresh);
else mStatisticsAdapter.loadMoreComplete();
if (mStatisticsAdapter.getData().size() == 0) {
mViewBinding.llEmpty.setVisibility(View.VISIBLE);
mViewBinding.statisticsRecycler.setVisibility(View.GONE);
} else {
mViewBinding.llEmpty.setVisibility(View.GONE);
mViewBinding.statisticsRecycler.setVisibility(View.VISIBLE);
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/OrderMainFragment.java
View file @ ae4a2d6f
......@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.statistics.fragment;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.view.View;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
......@@ -15,6 +16,7 @@ import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
import com.xingdata.zzdpos.ui.statistics.adapter.FragmentStateAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.StringUtil;
......@@ -22,6 +24,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.logging.Handler;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
......@@ -49,48 +52,16 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
@Override
public void initView() {
Calendar calendar = Calendar.getInstance();
//获得当前时间的月份，月份从0开始所以结果要加1
month= calendar.get(Calendar.MONTH) + 1;
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
initViewPager();
// mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
// @Override
// protected void myOnClickListener(View v) {
// getActivity().finish();
// }
// });
// mViewBinding.icTitle.tvTitle.setText(R.string.menu_statistics);
// mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
// integers = new ArrayList<>();
// integers.add(101);
// integers.add(102);
// mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
// mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
// mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
// mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
// public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
// switch ((int) adapter.getData().get(position)) {
// case C.MENU.MENU_VIP://会员
//
// break;
// case C.MENU.MENU_RECHARGE://充值
//
// break;
// case C.MENU.MENU_MS://营销
//
// break;
// case C.MENU.MENU_TICKET://优惠券
//
// break;
// case C.MENU.MENU_STATISTICS://统计
//
// break;
// case C.MENU.MENU_MANAGER://管理
//
// break;
//
// }
// }
// });
}
......@@ -103,9 +74,8 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
String date = TimeUtils.millis2String(System.currentTimeMillis(), new SimpleDateFormat(StringUtil.defaultDatePattern));
String[] dates = date.split("-");
int y = Integer.valueOf(dates[0]);
month = Integer.valueOf(dates[1]);
int m = month + 1;
for (int i = 0; i < 13; i++) {
for (int i = 0; i < 5; i++) {
if (m == 0) {
m = 12;
y--;
......@@ -149,10 +119,8 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.viewPagerData.setCurrentItem(0);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "");
......@@ -166,17 +134,19 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
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 + "");
month--;
}
mViewBinding.viewPagerData.setCurrentItem(0);
}
}
@Override
public void onStop() {
super.onStop();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java
View file @ ae4a2d6f
......@@ -41,8 +41,9 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
mViewBinding.icTitle.tvTitle.setText(R.string.menu_statistics);
mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
integers = new ArrayList<>();
integers.add(101);
integers.add(102);
integers.add(C.MENU.MENU_STATISTICS_ORDER);
integers.add(C.MENU.MENU_STATISTICS_MS);
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
......@@ -50,22 +51,10 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch ((int) adapter.getData().get(position)) {
case C.MENU.MENU_VIP://会员
case C.MENU.MENU_STATISTICS_ORDER://订单
mPresenter.clickOrderList();
break;
case C.MENU.MENU_RECHARGE://充值
break;
case C.MENU.MENU_MS://营销
break;
case C.MENU.MENU_TICKET://优惠券
break;
case C.MENU.MENU_STATISTICS://统计
break;
case C.MENU.MENU_MANAGER://管理
case C.MENU.MENU_STATISTICS_MS://营销
break;
......
app/src/main/res/layout/fragment_order_list.xml
View file @ ae4a2d6f
......@@ -2,6 +2,8 @@
<data>
<import type="android.view.View" />
<variable
name="month"
type="String" />
......@@ -9,6 +11,8 @@
<variable
name="amt"
type="String" />
</data>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
......@@ -51,19 +55,56 @@
android:layout_weight="1"
android:gravity="right"
android:padding="@dimen/all_padding"
android:text="@{amt}" />
android:text="@{amt}"
android:visibility="invisible" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_product"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_title">
<android.support.v7.widget.RecyclerView
android:id="@+id/statistics_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<LinearLayout
android:id="@+id/ll_empty"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="@id/srl_product"
app:layout_constraintStart_toStartOf="@id/srl_product"
app:layout_constraintTop_toTopOf="@id/srl_product"
app:layout_constraintBottom_toBottomOf="@id/srl_product">
<TextView
android:id="@+id/tv_empty"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/all_margin"
android:drawableTop="@mipmap/nong"
android:gravity="center"
android:lineSpacingExtra="@dimen/all_padding"
android:textColor="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_statistics.xml 0 → 100644
View file @ ae4a2d6f
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/img_left"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_margin="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderImage="@mipmap/img_head"
app:roundAsCircle="true" />
<TextView
android:id="@+id/tv_right_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/img_left" />
<TextView
android:id="@+id/tv_right_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_margin"
android:text="本店"
android:textSize="@dimen/small_text_size"
app:layout_constraintBottom_toBottomOf="@id/img_left"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/tv_left_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/padding_small"
android:text="1231231244124124"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintStart_toEndOf="@id/img_left"
app:layout_constraintTop_toTopOf="@id/img_left" />
<TextView
android:id="@+id/tv_left_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding"
android:text="11-15 15：23"
android:textSize="@dimen/small_text_size"
app:layout_constraintBottom_toBottomOf="@id/img_left"
app:layout_constraintStart_toEndOf="@id/img_left" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_left" />
</android.support.constraint.ConstraintLayout>
</layout>
app/src/main/res/layout/title_order.xml
View file @ ae4a2d6f
......@@ -28,28 +28,44 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
<!--<TextView-->
<!--android:id="@+id/tv_title"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_centerInParent="true"-->
<!--android:gravity="center"-->
<!--android:text="订单记录"-->
<!--android:textColor="@color/black_baozheng"-->
<!--android:textSize="@dimen/text_secondary_title"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintEnd_toStartOf="@id/iv_right"-->
<!--app:layout_constraintStart_toEndOf="@id/iv_back"-->
<!--app:layout_constraintTop_toTopOf="parent" />-->
<EditText
android:id="@+id/tv_title"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
android:text="订单记录"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"
android:layout_height="match_parent"
android:inputType="number"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/iv_right"
app:layout_constraintStart_toEndOf="@id/iv_back"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginRight="@dimen/all_padding" />
<ImageButton
android:id="@+id/iv_right"
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="@color/transparent"
android:src="@mipmap/scan_bg"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/view_empty.xml
View file @ ae4a2d6f
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
......@@ -18,4 +19,5 @@
android:textColor="@color/gray_huanggai"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
\ No newline at end of file
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ ae4a2d6f
......@@ -28,6 +28,7 @@
<!--PADDING-->
<dimen name="padding_big">24dp</dimen>
<dimen name="padding_medium">16dp</dimen>
<dimen name="padding_small">8dp</dimen>
<!--EditText 边框粗细-->
<dimen name="edit_border">0.5dp</dimen>
<!--一级标题-->
......
app/src/main/res/values/strings.xml
View file @ ae4a2d6f
......@@ -557,10 +557,13 @@
<!--<string name="handover_vip">储值卡收款</string>-->
<!--统计POS-->
<string name="statistics_hint">统计</string>
<string name="statistics_menu_order">订单</string>
<string name="statistics_menu_ms">营销</string>
<string name="statistics_todayAmt_hint">今日销售额</string>
<string name="statistics_todayOrder_hint">今日订单数</string>
<string name="statistics_todayRecharge_hint">今日充值</string>
<string name="statistics_todayVipAdd_hint">今日新增会员</string>
<string name="statistics_search_empty">没有查询到订单~</string>
</resources>
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