微调页面;

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/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/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"