Skip to content

T
TangKuPos
Commit 8c69a202 authored by 陈前's avatar 陈前
Browse files
Options

String

parent 05137101
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 31 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 8c69a202
......@@ -79,7 +79,7 @@ public class C {
/**
* 地址
*/
public static final String BASE_URL = URL_TEST;
public static final String BASE_URL = URL_DEMO;
private static final String PKG = "/tk/";
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ 8c69a202
......@@ -196,8 +196,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void showMarketingResult() {
PromptDialog mPromptDialog = new PromptDialog();
mPromptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SUCC, "开通成功");
mPromptDialog.setCustomButton("确定", view -> dismissAllDialog());
mPromptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SUCC, getString(R.string.paid_up_pay_suc));
mPromptDialog.setCustomButton(getString(R.string.all_confirm), view -> dismissAllDialog());
mPromptDialog.show((BaseActivity) ActivityUtils.getTopActivity(), 2);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java
View file @ 8c69a202
......@@ -6,6 +6,7 @@ import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.HandoverInfo;
......@@ -130,12 +131,12 @@ public class MainPresenter extends MainContract.Presenter {
mView.showUptateDialog(ver.getVerUrl(), ver.getVerTitle() + "\n\n" + ver
.getVerContent());
} else {
ToastUtils.showShort("已经是最新版本");
ToastUtils.showShort(R.string.update_hint_done);
}
}
}, throwable -> {
// ToastUtils.showShort(throwable.getMessage());
ToastUtils.showShort("已经是最新版本");
ToastUtils.showShort(R.string.update_hint_done);
}
);
......@@ -149,15 +150,7 @@ public class MainPresenter extends MainContract.Presenter {
mView.handoverOk();
}
// @Override
// public void clickFeedOk(Feed feed) {
// ApiFactory.Feed.addFeed(feed)
// .subscribe(object -> {
// }, throwable -> {
// ToastUtils.showShort(throwable.getMessage());
// });
// }
//
@Override
public void logout() {
ApiFactory.Test.logout()
......
app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/HandoverDialog.java
View file @ 8c69a202
......@@ -30,7 +30,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
@Override
public void onConfirmClick(View view) {
super.onConfirmClick(view);
mPresenter.clickHandoverOk();
mPresenter.clickHandoverOk();
}
......@@ -49,7 +49,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
mViewBinding.handoverTvSumamt.setText(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getFinallyAmt(), true));
mViewBinding.setOrderNum(String.valueOf(MainPresenter.handoverInfo.getSumOrder()));
setBtnName("取消","交班");
setBtnName(mContext.getString(R.string.handover_cancel), mContext.getString(R.string.handover_handover));
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ 8c69a202
......@@ -50,7 +50,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
private void initTitle() {
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
changeTitle("盘库记录", false);
changeTitle(mContext.getString(R.string.inventory_title), false);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......@@ -122,7 +122,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override
public void disInventoryDetailFragment(Boolean idChange) {
changeTitle("盘库记录", false);
changeTitle(mContext.getString(R.string.inventory_title), false);
if (idChange) {
mInventoryAddFragment.pop();
mInventoryFragment.onRefresh();
......@@ -148,7 +148,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
public void openInventoryAddFragment(Cs cs) {
mInventoryAddFragment = new InventoryAddFragment();
mInventoryAddFragment.setCs(cs);
changeTitle("商品盘点", true);
changeTitle(mContext.getString(R.string.inventory_add_title), true);
start(mInventoryAddFragment);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryPresenter.java
View file @ 8c69a202
......@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.manage.inventory;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DB;
......@@ -95,10 +96,10 @@ public class InventoryPresenter extends InventoryContract.Presenter {
} else if (ssskuPager.getList().size() == 1) {
mView.addInventoryGoodsItem(ssskuPager.getList().get(0));
} else {
ToastUtils.showShort("没有此商品");
ToastUtils.showShort(R.string.inventory_add_hint);
}
}, throwable -> {
ToastUtils.showShort("删除" + throwable.getMessage());
ToastUtils.showShort(throwable.getMessage());
});
}
......@@ -142,7 +143,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
.subscribe(object -> {
mView.disInventoryDetailFragment(false);
}, throwable -> {
ToastUtils.showShort("删除" + throwable.getMessage());
ToastUtils.showShort(throwable.getMessage());
});
}
......@@ -156,7 +157,7 @@ public class InventoryPresenter extends InventoryContract.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(R.string.all_hint_date);
mView.showDateAlert(true);
} else {
mView.showDateAlert(false);
......@@ -188,7 +189,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
.subscribe(csPager -> {
//判断是否能加载更多
if (csPager.getList().size() == 0) {
ToastUtils.showShort("没有盘库记录");
ToastUtils.showShort(R.string.inventory_hint);
} else {
mView.loadCs(csPager, start, end);
mView.setInventoryCount(com.blankj.utilcode.util.TimeUtils.millis2String(start, new SimpleDateFormat(StringUtil.defaultDatePattern)) + " ~ " +
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryAdapter.java
View file @ 8c69a202
......@@ -34,11 +34,11 @@ public class InventoryAdapter extends BaseAdapter<Cs, ItemInventoryBinding> {
mViewBinding.tvNum.setText(item.getCsdetailCount() + "");
switch (item.getCsResultFlag()) {
case 0:
mViewBinding.tvResult.setText("相符");
mViewBinding.tvResult.setText(R.string.inventory_adapter_tally);
mViewBinding.imgInventory.setImageResource(R.mipmap.ic_consistent);
break;
case 1:
mViewBinding.tvResult.setText("不相符");
mViewBinding.tvResult.setText(R.string.inventory_adapter_no_tally);
mViewBinding.imgInventory.setImageResource(R.mipmap.ic_not_consistent);
break;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryGoodsAdapter.java
View file @ 8c69a202
......@@ -10,6 +10,7 @@ import android.widget.EditText;
import android.widget.TextView;
import com.facebook.drawee.view.SimpleDraweeView;
import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.base.BaseViewHolder;
......@@ -48,7 +49,7 @@ public class InventoryGoodsAdapter extends BaseAdapter<Sssku, ItemInventoryGoods
mViewBinding.etCount.setText(item.getInventoryCut() + "");
mViewBinding.tvGoodsName.setText(item.getSpuName());
mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
mViewBinding.tvGoodsSize.setText(App.instance.getString(R.string.cart_size) + item.getSpuUnitName());
mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuRetailPrice1(), false));
mViewBinding.tvStock.setText(item.getSkuStock() + item.getSpuUnitName());
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/DeleteInventoryDialog.java
View file @ 8c69a202
......@@ -14,7 +14,6 @@ import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, DialogDeleteInventoryBinding> {
private BackCall mBackCall;
......@@ -36,7 +35,7 @@ public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, Dialog
@Override
public void initView() {
setBtnName("不删除", "删除");
setBtnName(mContext.getString(R.string.all_no_delete), mContext.getString(R.string.all_delete));
mViewBinding.tvDis.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java
View file @ 8c69a202
......@@ -107,7 +107,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
@Override
public void No() {
deleteInventoryDialog.dismiss();
pop();
mPresenter.exitInventoryAdd();
}
});
}
......
app/src/main/res/values/strings.xml
View file @ 8c69a202
......@@ -12,10 +12,12 @@
<string name="all_yes">是</string>
<string name="all_update">编辑</string>
<string name="all_delete">删除</string>
<string name="all_no_delete">不删除</string>
<string name="visible">visible</string>
<string name="gone">gone</string>
<string name="password">＊</string>
<string name="rate">%</string>
<string name="all_hint_date">日期不符合区间</string>
<!--返回-->
<string name="all_go_back">返回</string>
......@@ -65,6 +67,8 @@
<!--交班报表页面 <WHERE>_<DESCRIPTION>-->
<string name="handover_title">交班报表</string>
<string name="handover_cancel">取消</string>
<string name="handover_handover">交班</string>
<!--反馈页面 <WHERE>_<DESCRIPTION>-->
<string name="feedbcak_title">北京浙星技术有限公司</string>
......@@ -91,6 +95,7 @@
<string name="cart_amt">总计</string>
<string name="cart_pay">应收:</string>
<string name="cart_dis">优惠:</string>
<string name="cart_size">"规格/"</string>
<string name="cart_dis_list">优惠项目:</string>
<string name="cart_dis_change">抹零</string>
<string name="cart_dis_vip">会员折扣</string>
......@@ -284,7 +289,7 @@
<string name="replenishment_detail_title">定货明细</string>
<string name="replenishment_detail_full">货物满满\n不需要定货哦~</string>
<!--盘点界面-->
<string name="inventory_meun">库存盘点</string>
<string name="inventory_title">盘库记录</string>
<string name="inventory_add">开始盘库</string>
<string name="inventory_order">共%s人次盘库记录</string>
<string name="inventory_empty_hint">没有记录，请调整日期</string>
......@@ -294,6 +299,11 @@
<string name="inventory_add_btn_cancel">删除</string>
<string name="inventory_add_btn_print">打印清单</string>
<string name="inventory_add_btn_end">盘库结束</string>
<string name="inventory_adapter_tally">相符</string>
<string name="inventory_adapter_no_tally">不相符</string>
<string name="inventory_add_hint">没有此商品</string>
<string name="inventory_hint">无更多盘库记录</string>
<!--公告界面-->
<string name="announcement_meun">公告</string>
......@@ -751,10 +761,14 @@
<string name="paid_up_vip_model3">营销计划</string>
<string name="paid_up_vip_model4_detail">提前设置打折、促销、满减、换购等优惠活动，不错过每一个节日</string>
<string name="paid_up_pay_hint">请选择支付方式</string>
<string name="paid_up_pay_suc">开通成功</string>
<!--换购页面-->
<string name="gift_title">换购</string>
<string name="gift_select_all">全选</string>
<!--升级页面-->
<string name="update_hint_done">已经是最新版本</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment