UI

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -42,6 +42,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
     private HandoverDialog mHandoverDialog = new HandoverDialog();
     LoadingDialog mLoadingDialog = new LoadingDialog();
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_main;
@@ -49,7 +50,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
 
     @Override
     public void initView() {
-        mainActivity=this;
+        mainActivity = this;
         mPresenter.initHandoverInfo();
         List<BaseFragment> fragments = new ArrayList<>();
         fragments.add(new CasherFragment());
@@ -163,4 +164,9 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     public void showHandoverDialog() {
         mHandoverDialog.show(this);
     }
+
+    @Override
+    public void onBackPressedSupport() {
+
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java

@@ -39,9 +39,10 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
 
     @Override
     public void initView() {
-
+        mViewBinding.viewLine.setVisibility(View.VISIBLE);
         switch (fragmentMenu) {
             case C.MENU.MENU_STATISTICS_ORDER:
+                mViewBinding.viewLine.setVisibility(View.GONE);
                 FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
 
                 mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
@@ -105,6 +106,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
                 break;
 
             case C.MENU.MENU_STATISTICS_MS:
+                mViewBinding.viewLine.setVisibility(View.GONE);
                 FragmentUtils.add(getChildFragmentManager(), mMsMainFragment, mViewBinding.mainFrame.getId(), false, true);
                 mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
                 mViewBinding.icTitle.tvTitle.setText(R.string.menu_ms);
@@ -123,6 +125,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
+                mViewBinding.viewLine.setVisibility(View.GONE);
                 if (mViewBinding.icTitle.edTitle.isFocused()) {
                     mViewBinding.icTitle.edTitle.clearFocus();
                     return;
@@ -150,6 +153,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
     }
 
     public void searchSuc(Pager<Saleorder> saleorderPager, int payType) {
+        mViewBinding.viewLine.setVisibility(View.VISIBLE);
         if (mViewBinding.icTitle.edTitle.isFocused()) {
             mViewBinding.icTitle.edTitle.clearFocus();
         }
@@ -163,6 +167,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
     }
 
     public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
+        mViewBinding.viewLine.setVisibility(View.VISIBLE);
         if (mViewBinding.icTitle.edTitle.isFocused()) {
             mViewBinding.icTitle.edTitle.clearFocus();
         }
@@ -177,6 +182,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
     }
 
     public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
+        mViewBinding.viewLine.setVisibility(View.VISIBLE);
         if (mViewBinding.icTitle.edTitle.isFocused()) {
             mViewBinding.icTitle.edTitle.clearFocus();
         }
@@ -191,6 +197,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
 
 
     public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end) {
+        mViewBinding.viewLine.setVisibility(View.VISIBLE);
         if (!mRechargeSearchFragment.isAdded()) {
             mRechargeSearchFragment.setCreateData(vipRechargeOrderPager, start, end);
             FragmentUtils.add(getChildFragmentManager(), mRechargeSearchFragment, mViewBinding.mainFrame.getId(), false, true);
@@ -201,6 +208,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
     }
 
     public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
+        mViewBinding.viewLine.setVisibility(View.VISIBLE);
         if (!mTicketSearchFragment.isAdded()) {
             mTicketSearchFragment.setCreateData(ticketPager, start, end);
             FragmentUtils.add(getChildFragmentManager(), mTicketSearchFragment, mViewBinding.mainFrame.getId(), false, true);
@@ -212,6 +220,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
 
     @Override
     public boolean onBackPressedSupport() {
+        mViewBinding.viewLine.setVisibility(View.GONE);
         if (mViewBinding.icTitle.edTitle.isFocused()) {
             mViewBinding.icTitle.edTitle.clearFocus();
             return true;

app/src/main/res/layout/fragment_casher.xml

@@ -84,13 +84,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai"
+            android:background="@color/gray_kongming"
             app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai"
+            android:background="@color/gray_kongming"
             app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/fragment_ms_main.xml

@@ -41,5 +41,10 @@
 
         </android.support.v4.view.ViewPager>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/fragment_order_list.xml

@@ -80,7 +80,6 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/ll_title"
-            android:background="@color/white_caocao"
             android:gravity="center"
             android:orientation="vertical"
             android:visibility="gone">

app/src/main/res/layout/fragment_order_main.xml

@@ -21,7 +21,7 @@
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="30dp"
-            android:background="@color/white_caocao"
+            android:background="@drawable/singleline_white_gray"
             app:layout_constraintTop_toTopOf="parent"
             app:tabIndicatorHeight="0dp"
             app:tabMinWidth="100dp"

app/src/main/res/layout/fragment_order_search.xml

@@ -11,12 +11,10 @@
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
 
 
-
         <android.support.v4.widget.SwipeRefreshLayout
             android:id="@+id/srl_product"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginTop="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

app/src/main/res/layout/fragment_statistics.xml

@@ -159,5 +159,17 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/guideline" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
+
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/fragment_statistics_date.xml

@@ -53,7 +53,7 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/view_line_L1"
-                android:background="@color/gray_zhouyu"
+                android:background="@color/gray_huanggai"
                 app:layout_constraintBottom_toBottomOf="parent"/>
         </android.support.constraint.ConstraintLayout>
 

app/src/main/res/layout/fragment_statistics_title.xml

@@ -22,6 +22,12 @@
             layout="@layout/title_order"
             app:layout_constraintTop_toTopOf="parent" />
 
+        <View
+            android:id="@+id/view_line"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_huanggai"
+            app:layout_constraintBottom_toBottomOf="@id/ic_title" />
 
         <FrameLayout
             android:id="@+id/main_frame"

app/src/main/res/layout/item_string_head.xml

 <?xml version="1.0" encoding="utf-8"?>
-<layout>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
-        <View
+<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai"
-            android:layout_alignParentBottom="true" />
+        android:layout_height="wrap_content">
 
 
         <TextView
@@ -15,15 +11,19 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
+            android:background="@drawable/singleline_zhouyu_huanggai"
             android:gravity="left"
-            android:paddingTop="@dimen/all_padding"
             android:paddingBottom="@dimen/all_padding"
             android:paddingStart="@dimen/all_padding_left_right"
+            android:paddingTop="@dimen/all_padding"
             android:singleLine="true"
             android:text="北京店"
             android:textColor="@color/black"
-            android:textSize="14sp" />
+            android:textSize="14sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
-</RelativeLayout>
+    </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file