String 整理 统计

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java

@@ -5,6 +5,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.FragmentUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -61,11 +62,19 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
 
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
+        if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty));
+            return;
+        }
         mStatisticsTitleFragment.searchSuc(saleorderPager, wd);
     }
 
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, int payType) {
+        if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty));
+            return;
+        }
         mStatisticsTitleFragment.searchSuc(saleorderPager, payType);
     }
 
@@ -76,6 +85,10 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
 
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
+        if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty));
+            return;
+        }
         mStatisticsDateFragment.pop();
         mStatisticsTitleFragment.searchSuc(saleorderPager, start, end);
     }
@@ -83,12 +96,20 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
     @Override
     public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long
             end) {
+        if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty_recharge));
+            return;
+        }
         mStatisticsDateFragment.pop();
         mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start, end);
     }
 
     @Override
     public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
+        if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty_ticket));
+            return;
+        }
         mStatisticsDateFragment.pop();
         mStatisticsTitleFragment.searchTicketSuc(ticketPager, start, end);
     }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -119,18 +119,18 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         InventoryDetailAdapter mInventoryDetailAdapter = new InventoryDetailAdapter(cs
                 .getCsdetailList());
         viewInventoryDetailBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
-        mViewBinding.btnPrint.setText("取消");
-        mViewBinding.btnReturn.setText("打印清单");
+        mViewBinding.btnPrint.setText(getString(R.string.all_cancel));
+        mViewBinding.btnReturn.setText(getString(R.string.inventory_add_btn_print));
         viewInventoryDetailBinding.setOperName(cs.getOperName());
         viewInventoryDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(cs
                 .getCreateTime()));
         viewInventoryDetailBinding.setSumNum(cs.getCount() + "");
         switch (cs.getCsResultFlag()) {
             case 0:
-                viewInventoryDetailBinding.setFinallyResult("相符");
+                viewInventoryDetailBinding.setFinallyResult(getString(R.string.inventory_adapter_tally));
                 break;
             case 1:
-                viewInventoryDetailBinding.setFinallyResult("不相符");
+                viewInventoryDetailBinding.setFinallyResult(getString(R.string.inventory_adapter_no_tally));
                 break;
         }
         mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
@@ -139,7 +139,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 try {
                     ZX_PrintPOS.getInstance(MainActivity.mainActivity).printInventory(1, cs);
                 } catch (Exception e) {
-                    ToastUtils.showShort("无法打印");
+                    ToastUtils.showShort(getString(R.string.statistics_toast_noPrint));
                 }
 
 
@@ -199,6 +199,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
     @Override
     public void getOrderDetailSuss(Saleorder mSaleorder) {
+        ToastUtils.showShort(R.string.statistics_toast_refundSuc);
         mViewBinding.viewOrderDetail.getViewStub().inflate();
         ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding
                 .viewOrderDetail.getRoot());

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailPresenter.java

@@ -38,7 +38,7 @@ public class StatisticsDetailPresenter extends StatisticsDetailContract.Presente
             switch (response.getCode()) {
                 case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
                     ApiFactory.Test.returnOrder(saleorder.getOrderNo()).subscribe(s -> {
-                        ToastUtils.showLong("退货成功");
+
                         mView.returnOrderSuss();
                     }, throwable -> {
                         ToastUtils.showLong(throwable.getMessage());

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java

@@ -98,11 +98,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(vipRechargeOrderPager -> {
                     //判断是否能加载更多
-                    if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关充值记录");
-                    } else {
+
                         mView.searchRechargeSuc(vipRechargeOrderPager, startDate, endDate);
-                    }
+
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });
@@ -124,11 +122,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         mView.isShowLoading(true);
         ApiFactory.Ticket.query(pageNumber, nowPageSize, usedFlag, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
-                    if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关优惠券");
-                    } else {
+
                         mView.searchTicketSuc(ticketPager, startDate, endDate);
-                    }
+
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });
@@ -143,11 +139,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关订单");
-                    } else {
+
                         mView.searchSuc(saleorderPager, wd);
-                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
@@ -164,11 +158,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", payType).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关订单");
-                    } else {
+
                         mView.searchSuc(saleorderPager, payType);
-                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
@@ -182,11 +174,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关订单");
-                    } else {
+
                         mView.searchSuc(saleorderPager, startDate, endDate);
-                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
@@ -198,7 +188,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         long longStart = TimeUtils.string2Millis(dateStart, new SimpleDateFormat(StringUtil.defaultDatePattern));
         long longEnd = TimeUtils.string2Millis(dateEnd, new SimpleDateFormat(StringUtil.defaultDatePattern)) + 86400000L;
         if (longStart > longEnd) {
-            ToastUtils.showShort("日期不符合区间");
+            ToastUtils.showShort("date error");
             mView.showDateAlert(true);
         } else {
             mView.showDateAlert(false);

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

@@ -28,7 +28,7 @@ public class StatisticsTicketAdapter extends BaseAdapter<Ticket, ItemStatisticsB
     @Override
     protected void convert(ItemStatisticsBinding mViewBinding, Ticket item) {
         mViewBinding.imgLeft.setImageResource(R.mipmap.ic_text_ticket);
-        mViewBinding.tvLeftTop.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())+"元优惠券");
+        mViewBinding.tvLeftTop.setText(mContext.getString(R.string.tv_money,ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())));
         mViewBinding.tvLeftBottom.setText(TimeUtils.date2String(item.getCreateTime()));
     }
 

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

@@ -33,7 +33,7 @@ public class StatisticsTicketGroupAdapter extends BaseSectionQuickAdapter<Ticket
 
     @Override
     protected void convert(BaseViewHolder helper, Ticket item) {
-        helper.setText(R.id.tv_left_top, ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()) + "元优惠券");
+        helper.setText(R.id.tv_left_top, (mContext.getString(R.string.tv_money,ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()))));
         helper.setText(R.id.tv_left_bottom, TimeUtils.date2String(item.getCreateTime(),new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
         ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.icon_voucher02);
 

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

@@ -48,7 +48,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
 
                 mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
                 mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
-                mViewBinding.icTitle.tvTitle.setText("订单列表");
+                mViewBinding.icTitle.tvTitle.setText(getString(R.string.statistics_tv_orderList));
                 mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
                     @Override
                     protected void myOnClickListener(View v) {

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

@@ -170,7 +170,7 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
             if (i == 0) {
                 itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
             }
-            itemMenuBottomBinding.itemTv.setText(month + "月");
+            itemMenuBottomBinding.itemTv.setText(month + getString(R.string.statistics_tv_dateM));
             itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
 
             mViewBinding.tabLayout.getTabAt(i).setCustomView(view);

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

@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="取消"
+                android:text="@string/all_cancel"
                 android:textColor="@color/red_guanyu"
                 app:layout_constraintStart_toStartOf="parent" />
 
@@ -37,7 +37,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="选择时间"
+                android:text="@string/statistics_tv_dateSelect"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/big_text_size" />
 
@@ -47,7 +47,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="完成"
+                android:text="@string/settle_complete"
                 android:textColor="@color/red_guanyu"
                 app:layout_constraintEnd_toEndOf="parent" />
             <View

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

@@ -35,7 +35,7 @@
         <TextView
             android:id="@+id/tv_right_bottom"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="10dp"
             android:layout_marginEnd="@dimen/all_text_size_small"
             android:text="本店"
             android:textSize="@dimen/all_text_size_small"

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

@@ -43,6 +43,14 @@
     <string name="inventory_toast_ifDelete2">请确认删除此记录</string>
     <string name="inventory_tv_item">条目</string>
 
+    <!--统计界面-->
+    <string name="statistics_tv_this">本店</string>
+    <string name="statistics_tv_dateM">月</string>
+    <string name="statistics_tv_dateSelect">选择时间</string>
+    <string name="statistics_tv_orderList">订单列表</string>
+    <string name="statistics_toast_noPrint">无法打印</string>
+    <string name="statistics_toast_refundSuc">退货成功</string>
+