Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/model/VipRechargeOrder.java

@@ -15,7 +15,7 @@ import java.util.List;
  * Created by Administrator on 2017/12/15.
  */
 
-public class VipRechargeOrder  extends SectionEntity<MediaStore.Video> implements BaseOrderPrint, BaseBean {
+public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements BaseOrderPrint, BaseBean {
     private Long cardAmtPay;
     private Long cardAmtSend;
     private String orderNo;
@@ -33,6 +33,7 @@ public class VipRechargeOrder  extends SectionEntity<MediaStore.Video> implement
     public VipRechargeOrder(MediaStore.Video video) {
         super(video);
     }
+
     public VipRechargeOrder() {
         super(false, "");
     }
@@ -163,6 +164,9 @@ public class VipRechargeOrder  extends SectionEntity<MediaStore.Video> implement
 
     @Override
     public String getUserName() {
+        if (vipMobile == null || vipMobile.length() < 4) {
+            return vipName;
+        }
         return vipName + "(" + vipMobile.substring(vipMobile.length() - 4) + ")";
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java

@@ -20,6 +20,7 @@ import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 
 import com.xingdata.zzdpos.ui.main.adapter.MySelfRecyclerAdapter;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +39,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
     public void initView() {
         mViewBinding.setOpername(LoginPresenter.loginReturnBean.getOperName());
 //        mViewBinding.setPhone(LoginPresenter.loginReturnBean.getOperMobile()+"");
-        mViewBinding.setAddress(LoginPresenter.loginReturnBean.getCityProvName()+LoginPresenter.loginReturnBean.getCityCountyName()+LoginPresenter.loginReturnBean.getCityAddress());
+        mViewBinding.setAddress(LoginPresenter.loginReturnBean.getCityProvName() + LoginPresenter.loginReturnBean.getCityCountyName() + LoginPresenter.loginReturnBean.getCityAddress());
         mViewBinding.fragmentMyselfRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
         integers = new ArrayList<>();
         integers.add(107);
@@ -47,8 +48,8 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
         integers.add(110);
         integers.add(111);
         mMySelfRecyclerAdapter = new MySelfRecyclerAdapter(getActivity(), integers);
+        mViewBinding.fragmentMyselfRecycler.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 1, getResources().getColor(R.color.gray_kongming)));
         mMySelfRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentMyselfRecycler);
-//        mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyItemDecoration(getActivity(), 2, R.color.black_zhangfei));
         mMySelfRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
             public void onItemClick(BaseQuickAdapter adapter, View view, int position) {

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

@@ -104,6 +104,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     private void initRecycler() {
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
         mInventoryGoodsAdapter = new InventoryGoodsAdapter(topCsList);
+        mInventoryGoodsAdapter.setEmptyView(getEmptyView());
         mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
             PromptDialog delDialog = new PromptDialog();
             delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
@@ -226,4 +227,12 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 //        mViewBinding.etKeyword.setText("");
 //        KeyboardUtils.hideSoftInput(getActivity());
     }
+
+
+    private View getEmptyView() {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        TextView textView = view.findViewById(R.id.tv_empty);
+        textView.setText(R.string.inventory_add_empty_hint);
+        return view;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java

@@ -17,6 +17,7 @@ import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapt
 import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
 import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
 import com.xingdata.zzdpos.util.OnClickListener;
+import com.xingdata.zzdpos.util.RecyclerViewUtil;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsOrderGroupAdapter.java

@@ -42,7 +42,7 @@ public class StatisticsOrderGroupAdapter extends BaseSectionQuickAdapter<Saleord
             helper.setText(R.id.tv_left_top, item.getOrderNo());
         }
         if (item.getOrderPayAmt() > 0) {
-            helper.setText(R.id.tv_right_top, "+" + item.getPayAmt());
+            helper.setText(R.id.tv_right_top, "+" + ConvertUtil.fenToYuan(item.getOrderPayAmt(), false));
         } else {
             helper.setText(R.id.tv_right_top, item.getPayAmt());
 
@@ -74,6 +74,8 @@ public class StatisticsOrderGroupAdapter extends BaseSectionQuickAdapter<Saleord
                 ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.pay_credit);
 
                 break;
+            default:
+                ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.img_head);
         }
 
 

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

@@ -137,5 +137,4 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
     }
 
 
-
 }

app/src/main/java/com/xingdata/zzdpos/util/ConvertUtil.java

@@ -24,8 +24,9 @@ public class ConvertUtil {
      * @return 元
      */
     public static String fenToYuan(Long fen) {
-        if (fen == null) return "0.00";
-        return String.valueOf((double) fen / 100);
+        if (fen == null || fen == 0) return "0.00";
+        java.text.DecimalFormat df = new java.text.DecimalFormat("#.00");
+        return String.valueOf(df.format((double) fen / 100));
     }
 
 

app/src/main/res/drawable/red_lvzhi_border_allradius.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <corners android:radius="@dimen/all_radius" />
+
+    <solid android:color="@color/red_lvzhi" />
+
+</shape>
\ No newline at end of file

app/src/main/res/drawable/selector_guanyu_lvzhi_button_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/red_lvzhi_border_allradius" android:state_pressed="true" />
+    <item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" />
+    <item android:drawable="@drawable/red_border_allradius" />
+
+</selector>
\ No newline at end of file

app/src/main/res/drawable/shape_gray_r1.xml

 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <corners android:radius="@dimen/all_shape_radius" />
-    <solid android:color="@color/gray_zhouyu" />
+    <corners android:radius="10000dp" />
+    <solid android:color="@color/gray_kongming" />
 
 </shape>
\ No newline at end of file

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

@@ -8,8 +8,7 @@
             type="com.xingdata.zzdpos.util.OnClickListener"></variable>
     </data>
 
-    <android.support.constraint.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <android.support.constraint.ConstraintLayout 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"
@@ -19,16 +18,16 @@
         <include
             android:id="@+id/ic_title"
             layout="@layout/title"
-            app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
+            app:layout_constraintBottom_toTopOf="@+id/rv_menu" />
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rv_menu"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:background="@color/gray_zhouyu"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
+            app:layout_constraintTop_toBottomOf="@+id/ic_title" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -13,7 +13,10 @@
             style="@style/dialog_title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_line_width"
+            android:background="@color/gray_kongming" />
         <ViewStub
             android:id="@+id/vs_center"
             android:layout_width="match_parent"
@@ -32,37 +35,33 @@
             android:background="@color/white_caocao"
             android:orientation="horizontal">
 
-            <Button
+            <TextView
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
-                android:layout_margin="@dimen/all_padding"
-                android:gravity="center"
-                android:stateListAnimator="@null"
+                android:layout_marginBottom="@dimen/all_padding"
+                android:layout_marginTop="@dimen/all_padding"
                 android:text="@string/all_cancel"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_confirm"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop" />
+                app:layout_constraintTop_toTopOf="parent" />
 
-            <Button
+            <TextView
                 android:id="@+id/btn_confirm"
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
-                android:layout_margin="@dimen/all_padding"
-                android:gravity="center"
-                android:stateListAnimator="@null"
+                android:layout_marginBottom="@dimen/all_padding"
+                android:layout_marginTop="@dimen/all_padding"
                 android:text="@string/all_confirm"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_cancel"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop" />
+                app:layout_constraintTop_toTopOf="parent" />
 
         </android.support.constraint.ConstraintLayout>
 

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

@@ -58,8 +58,8 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/singleline_white_gray">
+                android:layout_height="match_parent"
+                android:background="@color/gray_zhouyu">
 
             </android.support.v7.widget.RecyclerView>
         </LinearLayout>

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

@@ -123,14 +123,25 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/fragment_myself_recycler"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/all_padding"
             android:layout_marginTop="@dimen/all_padding"
             android:background="@color/gray_zhouyu"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             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_constraintBottom_toBottomOf="@id/fragment_myself_recycler" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:background="@color/gray_kongming"
+            app:layout_constraintTop_toTopOf="@id/fragment_myself_recycler" />
+
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -159,17 +159,6 @@
             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/item_inventory_goods.xml

@@ -4,15 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-
-
     </data>
 
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/white_caocao"
+        android:background="@drawable/singleline_white_gray"
         android:paddingBottom="@dimen/all_padding">
 
 

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

@@ -24,29 +24,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv"
-            app:layout_constraintTop_toTopOf="@id/item_tv" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="@id/item_tv"
-            app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="@dimen/all_padding"
-            android:background="@color/gray_zhouyu"
-            app:layout_constraintTop_toBottomOf="@id/item_tv"
-            app:layout_constraintEnd_toEndOf="@id/item_tv"
-            app:layout_constraintStart_toStartOf="@id/item_tv" />
 
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_text_size_small"
             android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_text_size_small"
+            android:textSize="@dimen/all_text_size"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/img_left" />
@@ -47,7 +47,7 @@
             android:id="@+id/tv_left_top"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/padding_small"
+            android:layout_marginStart="@dimen/all_padding_left_right"
             android:text="1231231244124124"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size"
@@ -58,7 +58,7 @@
             android:id="@+id/tv_left_bottom"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_padding"
+            android:layout_marginStart="@dimen/all_margin"
             android:text="11-15    15：23"
             android:textSize="@dimen/all_text_size_small_small"
             app:layout_constraintBottom_toBottomOf="@id/img_left"

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

@@ -15,36 +15,36 @@
         android:layout_height="?attr/actionBarSize"
         android:background="@color/white_caocao"
         android:focusable="true"
-        android:focusableInTouchMode="true"
-        >
+        android:focusableInTouchMode="true">
 
 
         <ImageButton
             android:id="@+id/iv_back"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@color/transparent"
             android:onClick="@{onClickListener}"
+            android:padding="@dimen/all_padding"
             android:src="@mipmap/go_back"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
 
-
         <EditText
             android:id="@+id/ed_title"
             style="@style/searchBarEditor"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="30dp"
+            android:drawablePadding="@dimen/all_padding"
             android:hint="@string/statistics_order_edit_hint"
             android:inputType="number"
             android:textColor="@color/black_likui"
-            android:textColorHint="@color/gray_kongming"
-            android:textSize="@dimen/all_text_size"
+            android:textSize="@dimen/all_text_size_low"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/iv_right"
-            app:layout_constraintStart_toEndOf="@id/iv_back"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintLeft_toRightOf="@id/iv_back"
+            app:layout_constraintRight_toLeftOf="@id/iv_right"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_goneMarginRight="@dimen/all_padding" />
 
@@ -62,11 +62,12 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_goneMarginRight="?attr/actionBarSize" />
 
-        <ImageButton
+        <ImageView
             android:id="@+id/iv_right"
-            android:layout_width="?attr/actionBarSize"
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:background="@color/transparent"
+            android:padding="@dimen/all_padding"
             android:src="@mipmap/ic_dates"
             android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"

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

@@ -25,9 +25,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_margin="0dp"
+                android:background="@color/gray_kongming"
                 android:layout_weight="1"
                 android:imeOptions="actionSearch"
-                android:background="@color/listview_bg"
                 android:hint="请输入手机号或会员姓名" />
 
         </LinearLayout>

app/src/main/res/values/dimens.xml

@@ -7,7 +7,7 @@
     <dimen name="all_margin">18dp</dimen>
     <dimen name="all_margin_big_big">40dp</dimen>
     <dimen name="all_margin_big">28dp</dimen>
-    <dimen name="all_spacing">6dp</dimen>
+    <dimen name="all_spacing">8dp</dimen>
     <dimen name="all_sub_title_size">20sp</dimen>
     <dimen name="big_text_size">18sp</dimen>
     <dimen name="big_big_text_size">20sp</dimen>

app/src/main/res/values/strings.xml

@@ -287,6 +287,7 @@
     <string name="inventory_add">开始盘库</string>
     <string name="inventory_order">共%s人次盘库记录</string>
     <string name="inventory_empty_hint">没有记录，请调整日期</string>
+    <string name="inventory_add_empty_hint">请输入商品条码搜索商品</string>
     <string name="inventory_add_title">商品盘点</string>
     <string name="inventory_add_et_hint">请输入商品条码</string>
     <string name="inventory_add_btn_cancel">删除</string>

app/src/main/res/values/styles.xml

@@ -283,15 +283,16 @@
         <item name="android:textSize">@dimen/small_text_size</item>
     </style>
 
-    <style name="button_positive" parent="android:ButtonBar">
-        <item name="android:background">@drawable/red_border_allradius</item>
+    <style name="button_positive">
+        <item name="android:background">@drawable/selector_guanyu_lvzhi_button_background</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
+        <item name="android:textSize">@dimen/all_text_size</item>
         <item name="android:focusable">false</item>
         <item name="android:focusableInTouchMode">false</item>
     </style>
 
-    <style name="button_positive_noradius" parent="android:ButtonBar">
+    <style name="button_positive_noradius">
         <item name="android:background">@drawable/selector_gradient_red_button_background_noradius
         </item>
         <item name="android:textColor">@color/white</item>
@@ -335,9 +336,10 @@
         <item name="android:background">@drawable/xu_line</item>
     </style>
 
-    <style name="button_passive" parent="android:ButtonBar">
+    <style name="button_passive">
         <item name="android:background">@drawable/selector_gradient_gray_button_background</item>
         <item name="android:textColor">@drawable/selector_gray_button_text_color</item>
+        <item name="android:textSize">@dimen/all_text_size</item>
         <item name="android:gravity">center</item>
     </style>
 
@@ -409,12 +411,13 @@
     <style name="searchBarEditor">
         <item name="android:drawableStart">@mipmap/ic_search</item>
         <item name="android:drawablePadding">@dimen/all_spacing</item>
+        <item name="android:paddingStart">@dimen/all_padding</item>
         <item name="android:maxLines">1</item>
         <item name="android:maxLength">20</item>
         <item name="android:background">@drawable/shape_gray_r1</item>
-        <item name="android:padding">@dimen/all_spacing</item>
         <item name="android:imeOptions">actionSearch</item>
     </style>
+
     <style name="searchEditor">
         <item name="android:drawablePadding">@dimen/all_spacing</item>
         <item name="android:maxLines">1</item>