Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -207,11 +207,13 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void backToPaymentActivity() {
+        ActivityUtils.startActivity(this, MainActivity.class);
         ActivityUtils.startActivity(this, PaymentActivity.class);
     }
 
     @Override
     public void backToStoreActivity() {
+        ActivityUtils.startActivity(this, MainActivity.class);
         ActivityUtils.startActivity(this, StoreActivity.class);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/TicketAdapter.java

@@ -22,12 +22,9 @@ public class TicketAdapter extends BaseAdapter<Ticket, ItemSettleTicketBinding>
 
     @Override
     protected void convert(ItemSettleTicketBinding mViewBinding, Ticket item) {
-        mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
-                ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt())));
-        mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
-                ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
-        mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
-                TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))));
+        mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTicketValAmt()));
+        mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
+        mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date, TimeUtils.millis2String(item.getTicketExp(), new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault()))));
 
         if (item.isSelected()) {
             mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke);

app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/PayResultFragment.java

@@ -11,6 +11,7 @@ import com.xingdata.zzdpos.ui.settle.SettlePresenter;
 public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPayResultBinding> {
     private boolean mResult;
     private Saleorder mSaleorder;
+    private int mSettleMode;
 
     @Override
     public int getLayoutId() {
@@ -41,6 +42,16 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay
         mViewBinding.btnContinue.setOnClickListener(view -> {
             mPresenter.clickContinue();
         });
+
+
+        switch (mSettleMode) {
+            case C.SETTLE_MODE.PAYMENT:
+                mViewBinding.setStrSettleMode("继续收款");
+                break;
+            case C.SETTLE_MODE.STORE:
+                mViewBinding.setStrSettleMode("继续开单");
+                break;
+        }
     }
 
     @Override
@@ -79,14 +90,7 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay
      * @return this
      */
     public PayResultFragment setSettleMode(int settleMode) {
-        switch (settleMode) {
-            case C.SETTLE_MODE.PAYMENT:
-                mViewBinding.setStrSettleMode("继续收款");
-                break;
-            case C.SETTLE_MODE.STORE:
-                mViewBinding.setStrSettleMode("继续开单");
-                break;
-        }
+        this.mSettleMode = settleMode;
         return this;
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -150,25 +150,26 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         if (radioButton.isChecked()) {
             strVipLevle = radioButton.getTag() == null ? null : radioButton.getTag().toString();
             radioButton.getPaint().setFakeBoldText(true);
-            radioButton.setTextSize(17);
+            radioButton.setTextSize(16);
             vipListAdapter.setEnableLoadMore(true);
             mPresenter.getVipList(0, strVipLevle);
         } else {
-            radioButton.setTextSize(15);
+            radioButton.setTextSize(14);
+            radioButton.getPaint().setFakeBoldText(false);
         }
     }
 
     @SuppressLint("ResourceAsColor")
     private RadioButton addRadioButton(LinearLayout.LayoutParams layoutParams, Level level) {
         RadioButton radioButton = new RadioButton(getActivity());
-        radioButton.setTextSize(15);
+        radioButton.setTextSize(14);
         radioButton.setText(level.getVipLevelName());
         radioButton.setTag(level.getVipLevel());
         radioButton.setGravity(Gravity.CENTER);
         radioButton.setButtonDrawable(null);
-        radioButton.getPaint().setFakeBoldText(true);
+//        radioButton.getPaint().setFakeBoldText(true);
         radioButton.setBackgroundResource(R.drawable.checkbox_viplevel_bg);
-        radioButton.setTextColor(R.color.black_baozheng);
+        radioButton.setTextColor(getResources().getColor(R.color.black));
         radioButton.setLayoutParams(layoutParams);
         radioButton.setPadding(0, 40, 0, 40);
         return radioButton;
@@ -196,7 +197,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 //            setVipLevel(levelPager.getList(), mViewBinding.vipLevelRadioGroup.findViewById(id).getTag().toString());
             for (int i = 0; i < mViewBinding.vipLevelR.getChildCount(); i++) {
                 //动态设置按钮颜色
-                setRadioButtonChecked(id);
+                setRadioButtonChecked(mViewBinding.vipLevelR.getChildAt(i).getId());
             }
         });
         if (levelPager.getList().size() != 0) {

app/src/main/java/com/xingdata/zzdpos/zxpay.java

-package com.xingdata.zzdpos;
-
-
-public class zxpay {
-
-    static {
-        System.loadLibrary("jsonpay");
-    }
-
-
-    public static native String jsonpay(String string);
-
-
-}

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

@@ -246,7 +246,7 @@
                             <TextView
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="5"
+                                android:layout_weight="4"
                                 android:gravity="start"
                                 android:text="@string/cart_amt"
                                 android:textColor="@color/black_baozheng"

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

@@ -66,16 +66,14 @@
 
             <TextView
                 android:id="@+id/tv_confirm"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/button2_width"
+                android:layout_height="@dimen/button2_height"
                 android:background="@drawable/shape_red_round_rectangle_more_round"
-                android:foreground="?android:attr/selectableItemBackgroundBorderless"
-                android:paddingBottom="@dimen/all_spacing"
-                android:paddingEnd="@dimen/all_margin_big"
-                android:paddingStart="@dimen/all_margin_big"
-                android:paddingTop="@dimen/all_spacing"
+                android:foreground="?android:attr/actionBarItemBackground"
+                android:gravity="center"
                 android:text="@string/all_confirm"
-                android:textColor="@color/white_caocao" />
+                android:textColor="@color/white_caocao"
+                android:textSize="@dimen/all_text_size" />
 
         </LinearLayout>
     </LinearLayout>

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

@@ -59,11 +59,7 @@
                         android:hint="请输入姓名" />
                 </LinearLayout>
 
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginRight="@dimen/all_margin_left"
-                    android:background="@color/line_bg" />
+                <include layout="@layout/line_layout_margin_right"></include>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -101,15 +97,12 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/all_margin"
                 android:layout_gravity="center_vertical"
+                android:layout_margin="@dimen/all_margin"
                 android:background="@mipmap/iv_vip" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -132,22 +125,22 @@
                 android:text="性别" />
 
             <RadioGroup
-                android:gravity="center_vertical"
                 android:id="@+id/vip_sex"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="@dimen/all_margin_left"
                 android:layout_marginRight="100dp"
+                android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <RadioButton
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginRight="@dimen/all_margin_left"
                     android:layout_weight="1"
                     android:background="@drawable/selector_checkbox_bg"
                     android:button="@null"
                     android:tag="1"
-                    android:layout_marginRight="@dimen/all_margin_left"
                     android:text="男" />
 
                 <RadioButton
@@ -162,16 +155,13 @@
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
             android:background="@color/white"
+            android:gravity="center_vertical"
             android:orientation="horizontal">
 
             <ImageView
@@ -186,20 +176,16 @@
                 android:text="级别" />
 
             <TextView
-                style="@style/default_blacktext_nopadding_smallstyle"
                 android:id="@+id/vip_discounts"
+                style="@style/default_blacktext_nopadding_smallstyle"
                 android:layout_width="match_parent"
                 android:layout_marginLeft="@dimen/sp_12"
-                android:gravity="center_vertical"
                 android:layout_marginRight="100dp"
                 android:drawableRight="@mipmap/ic_expand"
+                android:gravity="center_vertical"
                 android:onClick="@{onClickListener}" />
         </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -218,16 +204,13 @@
                 android:id="@+id/vip_birthday"
                 style="@style/default_blacktext_nopadding_smallstyle"
                 android:layout_width="match_parent"
-                android:hint="请选择"
                 android:layout_marginLeft="21dp"
-                android:textSize="@dimen/all_body_size"
-                android:onClick="@{onClickListener}" />
+                android:hint="请选择"
+                android:onClick="@{onClickListener}"
+                android:textSize="@dimen/all_body_size" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout"></include>
 
         <RelativeLayout
             android:layout_width="match_parent"

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

@@ -31,11 +31,6 @@
                 android:layout_height="wrap_content"
                 android:text="基本信息" />
         </LinearLayout>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/gray_huanggai" />
       <include layout="@layout/line_layout"></include>
 
         <LinearLayout
@@ -78,13 +73,7 @@
                         android:background="@null"
                         android:hint="请输入等级名称" />
                 </LinearLayout>
-
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:layout_marginLeft="@dimen/all_margin_left"
-                    android:layout_marginRight="@dimen/all_margin_left"
-                    android:background="@color/line_bg" />
+                <include layout="@layout/line_layout_margin"></include>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -123,10 +112,7 @@
 
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -142,10 +128,7 @@
                 android:text="本级标准" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -179,12 +162,7 @@
                 android:text="天" />
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginLeft="@dimen/all_margin_left"
-            android:layout_marginRight="@dimen/all_margin_left"
-            android:background="@color/line_bg" />
+        <include layout="@layout/line_layout_margin"></include>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -223,7 +201,7 @@
                 android:layout_marginLeft="@dimen/all_margin_left"
                 android:text="元" />
         </LinearLayout>
-
+        <include layout="@layout/line_layout"></include>
 
         <RelativeLayout
             android:layout_width="match_parent"

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

@@ -59,11 +59,7 @@
             </LinearLayout>
         </LinearLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_margin="@dimen/view_line_L5"
-            android:background="@color/line1" />
+        <include layout="@layout/line_layout"></include>
 
 
         <RelativeLayout

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

@@ -11,9 +11,13 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/gray_zhouyu"
         android:orientation="vertical">
 
-        <include layout="@layout/title" android:id="@+id/title_layout"/>
+        <include
+            android:id="@+id/title_layout"
+            layout="@layout/title" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -30,26 +34,30 @@
             <ImageView
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
-                android:background="@mipmap/swipe_card_bg" />
+                android:background="@mipmap/swipe_card_bg"
+                android:visibility="gone" />
 
             <ImageView
                 android:id="@+id/onScan"
                 android:layout_width="50dp"
                 android:layout_height="match_parent"
                 android:background="@mipmap/scan_bg"
-                android:onClick="@{onClickListener}" />
+                android:onClick="@{onClickListener}"
+                android:visibility="gone" />
         </LinearLayout>
 
         <View
             android:layout_width="wrap_content"
             android:layout_height="@dimen/all_margin_left"></View>
+
         <include layout="@layout/line_layout" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_10"
             android:background="@color/white"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingTop="@dimen/all_margin_left">
 
             <TextView
                 android:id="@+id/vip_count_title"
@@ -74,7 +82,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingBottom="@dimen/all_margin_left">
 
             <TextView
                 android:id="@+id/vip_count"
@@ -83,6 +92,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:text="1111"
                 android:textSize="22sp"
                 android:textStyle="bold" />
 
@@ -93,6 +103,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
+                android:text="1111"
                 android:textSize="22sp"
                 android:textStyle="bold" />
         </LinearLayout>
@@ -104,7 +115,7 @@
             android:id="@+id/addVipLinearLayout"
             android:layout_width="match_parent"
             android:layout_height="58dp"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/all_margin_left"
             android:background="@color/white"
             android:gravity="center"
             android:orientation="vertical">
@@ -138,10 +149,15 @@
 
         <include layout="@layout/line_layout" />
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/all_margin_left"></View>
+
+        <include layout="@layout/line_layout" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/all_margin_left"
             android:layout_weight="1"
             android:orientation="horizontal">
 
@@ -158,6 +174,7 @@
                     android:orientation="vertical"></RadioGroup>
             </LinearLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

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

@@ -61,17 +61,18 @@
                 <EditText
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
+                    android:hint="请输入手会员手机号"
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="40dp"
                     android:layout_weight="1"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
-                    android:textSize="@dimen/all_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
                     android:id="@+id/search_ImageButton"
                     style="@style/textView_body"
-                    android:layout_width="60dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:onClick="@{OnClickListener}"
                     android:text="搜索" />

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

@@ -14,7 +14,11 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:paddingBottom="@dimen/all_spacing"
+        android:paddingEnd="@dimen/all_margin"
+        android:paddingStart="@dimen/all_margin"
+        android:paddingTop="@dimen/all_spacing">
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -73,10 +73,8 @@
                     android:textColor="@color/black_likui" />
             </LinearLayout>
         </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+
+        <include layout="@layout/line_layout" />
 
     </LinearLayout>
 

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

@@ -4,6 +4,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         android:orientation="vertical">
 
         <LinearLayout
@@ -13,10 +14,10 @@
             android:orientation="horizontal">
 
             <ImageView
-                android:layout_margin="@dimen/all_margin_left"
-                android:background="@mipmap/iv_vip"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/all_margin_left"
+                android:background="@mipmap/iv_vip" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -46,10 +47,8 @@
                 android:layout_height="wrap_content"
                 android:text="85折" />
         </LinearLayout>
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="@color/line_bg" />
+
+        <include layout="@layout/line_layout_margin_left"></include>
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0.5dp"
+    android:background="@color/gray_huanggai"
+    android:layout_marginLeft="@dimen/all_margin_left"
+    ></LinearLayout>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0.5dp"
+    android:background="@color/gray_huanggai"
+    android:layout_marginRight="@dimen/all_margin_left"
+    ></LinearLayout>
\ No newline at end of file