Skip to content

T
TangKuPos
Commit f814ba6f authored by zhang_z's avatar zhang_z
Browse files
Options

Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

parents 0728a82c ad3e5d4c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 504 additions and 277 deletions
.idea/modules.xml
View file @ f814ba6f
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" /> <module fileurl="file://$PROJECT_DIR$/TangKuPos.iml" filepath="$PROJECT_DIR$/TangKuPos.iml" />
<module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
<module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" /> <module fileurl="file://D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" filepath="D:\Work\Android\AndroidProject\XingData\TangKuPos\.idea\TangKuPos.iml" />
<module fileurl="file://C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" filepath="C:\Users\JM_DEV\AndroidStudioProjects\TangKuPos\TangKuPos.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules> </modules>
</component> </component>
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ f814ba6f
...@@ -638,7 +638,19 @@ public final class ApiFactory { ...@@ -638,7 +638,19 @@ public final class ApiFactory {
public static Observable<String> batchSend(String birthdayType, String vipLevel, Long public static Observable<String> batchSend(String birthdayType, String vipLevel, Long
vipId, Long truleId) { vipId, Long truleId) {
return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId, truleId) return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
truleId, null)
.onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.retryWhen(new RetryHelper(3));
}
public static Observable<String> batchSendBefor(String birthdayType, String vipLevel, Long
vipId, Long truleId) {
return Api.getInstance().service.ticketBatchSend(birthdayType, vipLevel, vipId,
truleId, "true")
.onErrorReturn(new ErrorFilter<>()) .onErrorReturn(new ErrorFilter<>())
.map(new ResultFilter<>()) .map(new ResultFilter<>())
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
......
app/src/main/java/com/xingdata/zzdpos/api/ApiService.java
View file @ f814ba6f
...@@ -195,18 +195,22 @@ interface ApiService { ...@@ -195,18 +195,22 @@ interface ApiService {
@POST(C.URL.RCTRACE.query) @POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
pageNum, @Query pageNum, @Query
("pageSize") int pageSize); ("pageSize") int
pageSize);
@POST(C.URL.RCTRACE.query) @POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId, Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("vipId") long vipId,
@Query("pageNumber") int @Query("pageNumber") int
pageNum, @Query pageNum, @Query
("pageSize") int pageSize); ("pageSize") int
pageSize);
@POST(C.URL.RCTRACE.query) @POST(C.URL.RCTRACE.query)
Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int Observable<HttpMessage<Pager<VipRechargeOrder>>> queryRecharge(@Query("pageNumber") int
pageNum, @Query pageNum, @Query
("pageSize") int pageSize, @Query("startDate") long startDate, @Query("endDate") long ("pageSize") int
pageSize, @Query
("startDate") long startDate, @Query("endDate") long
endDate); endDate);
@POST(C.URL.PSB.queryDetail) @POST(C.URL.PSB.queryDetail)
...@@ -239,14 +243,18 @@ interface ApiService { ...@@ -239,14 +243,18 @@ interface ApiService {
@POST(C.URL.TICKET.query) @POST(C.URL.TICKET.query)
Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query Observable<HttpMessage<Pager<Ticket>>> queryTicket(@Query("pageNumber") int pageNum, @Query
("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList") ("pageSize") int pageSize, @Query("usedFlag") int usedFlag, @Query("ticketIsList")
String ticketIsList, @Query("startDate") long startDate, @Query("endDate") long String ticketIsList, @Query
("startDate") long startDate,
@Query("endDate") long
endDate); endDate);
@POST(C.URL.TICKET.ticketBatchSend) @POST(C.URL.TICKET.ticketBatchSend)
Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType, Observable<HttpMessage<String>> ticketBatchSend(@Query("birthdayType") String birthdayType,
@Query("vipLevel") String vipLevel, @Query("vipLevel") String vipLevel,
@Query("vipId") Long vipId, @Query("vipId") Long vipId,
@Query("truleId") Long truleId); @Query("truleId") Long truleId, @Query
("flag") String flag);
@POST(C.URL.SALEORDER.addOrderMis) @POST(C.URL.SALEORDER.addOrderMis)
Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam); Observable<HttpMessage<String>> addOrderMis(@Body Saleorder.Param saleorderParam);
...@@ -257,7 +265,10 @@ interface ApiService { ...@@ -257,7 +265,10 @@ interface ApiService {
@POST(C.URL.SALEORDER.querySaleorderByVipId) @POST(C.URL.SALEORDER.querySaleorderByVipId)
Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId, Observable<HttpMessage<Pager<Saleorder>>> querySaleorderByVipId(@Query("vipId") Long vipId,
@Query @Query
("pageNumber") int pageNum, @Query("pageSize") int pageSize); ("pageNumber") int
pageNum, @Query
("pageSize") int
pageSize);
@POST(C.URL.USER.query) @POST(C.URL.USER.query)
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleIndexFragment.java
View file @ f814ba6f
...@@ -84,6 +84,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI ...@@ -84,6 +84,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
); );
loadingDialog.show((BaseActivity) getActivity()); loadingDialog.show((BaseActivity) getActivity());
mPresenter.usskuQuery("", loadingDialog); mPresenter.usskuQuery("", loadingDialog);
KeyboardUtils.showSoftInput(mViewBinding.tvKeyword); KeyboardUtils.showSoftInput(mViewBinding.tvKeyword);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachFragment.java
View file @ f814ba6f
...@@ -3,8 +3,10 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment; ...@@ -3,8 +3,10 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView; import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
...@@ -72,6 +74,10 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS ...@@ -72,6 +74,10 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
} }
); );
mViewBinding.etKeyword.setFocusable(true);
mViewBinding.etKeyword.setFocusableInTouchMode(true);
mViewBinding.etKeyword.requestFocus();
KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachShopFragment.java
View file @ f814ba6f
...@@ -6,6 +6,7 @@ import android.view.KeyEvent; ...@@ -6,6 +6,7 @@ import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
...@@ -105,6 +106,10 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter, ...@@ -105,6 +106,10 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
} }
); );
mViewBinding.etKeyword.setFocusable(true);
mViewBinding.etKeyword.setFocusableInTouchMode(true);
mViewBinding.etKeyword.requestFocus();
KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
} }
public void setNewData(List<Sssku> newData, Boolean isLoadMore) { public void setNewData(List<Sssku> newData, Boolean isLoadMore) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
View file @ f814ba6f
...@@ -32,8 +32,8 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind ...@@ -32,8 +32,8 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) { protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
// mViewBinding.tvSend.setText("发\n券"); // mViewBinding.tvSend.setText("发\n券");
// mViewBinding.tvSend.setText("\n"); // mViewBinding.tvSend.setText("\n");
mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money, // mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()))); // ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money, mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()))); ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketActivity.java
View file @ f814ba6f
...@@ -56,6 +56,12 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter, ...@@ -56,6 +56,12 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
mPresenter.sendTickerFragment.sendSucc(); mPresenter.sendTickerFragment.sendSucc();
} }
@Override
public void sendTickerBeforSucc(long count,LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
mPresenter.sendTickerFragment.sendSuccBefor(count);
}
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketContract.java
View file @ f814ba6f
...@@ -34,7 +34,9 @@ public interface SendTicketContract { ...@@ -34,7 +34,9 @@ public interface SendTicketContract {
void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog); void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog);
void sendTickerSucc( LoadingDialog loadingDialog); void sendTickerSucc(LoadingDialog loadingDialog);
void sendTickerBeforSucc(long count,LoadingDialog loadingDialog);
} }
abstract class Presenter extends BasePresenter<View> { abstract class Presenter extends BasePresenter<View> {
...@@ -56,5 +58,8 @@ public interface SendTicketContract { ...@@ -56,5 +58,8 @@ public interface SendTicketContract {
abstract void sendTicker(String birthdayType, String vipLevel, Long abstract void sendTicker(String birthdayType, String vipLevel, Long
vipId, Long truleId, LoadingDialog loadingDialog); vipId, Long truleId, LoadingDialog loadingDialog);
abstract void sendTickerBefor(String birthdayType, String vipLevel, Long
vipId, Long truleId, LoadingDialog loadingDialog);
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketPresenter.java
View file @ f814ba6f
...@@ -66,4 +66,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter { ...@@ -66,4 +66,14 @@ public class SendTicketPresenter extends SendTicketContract.Presenter {
mView.error(throwable.getMessage(), loadingDialog); mView.error(throwable.getMessage(), loadingDialog);
}); });
} }
@Override
public void sendTickerBefor(String birthdayType, String vipLevel, Long vipId, Long truleId,
LoadingDialog loadingDialog) {
ApiFactory.Ticket.batchSendBefor(birthdayType, vipLevel, vipId, truleId).subscribe(s -> {
mView.sendTickerBeforSucc(Long.parseLong(s), loadingDialog);
}, throwable -> {
mView.error(throwable.getMessage(), loadingDialog);
});
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/ReturnTicketAdapter.java
View file @ f814ba6f
...@@ -31,18 +31,18 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind ...@@ -31,18 +31,18 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) { protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
if (item.isSelect()) { if (item.isSelect()) {
mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke); mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect01_stroke);
mViewBinding.ivSelect.setVisibility(View.VISIBLE);
} else { } else {
mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect02_stroke); mViewBinding.ivSelect.setImageResource(R.mipmap.but_elect02_stroke);
mViewBinding.ivSelect.setVisibility(View.GONE);
} }
mViewBinding.ivSelect.setVisibility(View.VISIBLE); // mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money, // ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()))); mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()))); ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date, mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyy-mm-dd")))); TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-mm-dd"))));
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java 0 → 100644
View file @ f814ba6f
package com.xingdata.zzdpos.ui.sendticke.dialog;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.databinding.DialogSendtickerBeforBinding;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
/**
* Created by Administrator on 2018/1/17.
*/
public class SendTickerBeforDialog extends BaseDialog<SendTicketPresenter,
DialogSendtickerBeforBinding> {
@Override
public int getLayoutId() {
return R.layout.dialog_sendticker_befor;
}
@Override
public void initView() {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @ f814ba6f
...@@ -43,7 +43,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -43,7 +43,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
VipGroupAdapter vipGroupAdapter; VipGroupAdapter vipGroupAdapter;
LoadingDialog loadingDialog = new LoadingDialog(); LoadingDialog loadingDialog = new LoadingDialog();
//当前优惠券点击的item id //当前优惠券点击的item id
int nowTickerItemId = -1; int nowTickerItemId = 0;
List<Trule> truleList = new ArrayList<>(); List<Trule> truleList = new ArrayList<>();
//当前选中会员组别Item ID //当前选中会员组别Item ID
int nowVipGroupId = 0; int nowVipGroupId = 0;
...@@ -92,13 +92,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -92,13 +92,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
loadingDialog.show((BaseActivity) getActivity()); loadingDialog.show((BaseActivity) getActivity());
if (nowtype == 0) { if (nowtype == 0) {
//单独会员发券 //单独会员发券
mPresenter.sendTicker(null, null, nowVip.getVipId(), tickerId, mPresenter.sendTickerBefor(null, null, nowVip.getVipId(), tickerId,
loadingDialog); loadingDialog);
} else if (nowtype == 1) { } else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId(); Long tempLevelId = levelList.get(nowVipGroupId).getId();
if (tempLevelId == SendTickerC.getVipType().get(0).getId()) { if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
//选择全部会员 //选择全部会员
mPresenter.sendTicker(null, null, null, tickerId, mPresenter.sendTickerBefor(null, null, null, tickerId,
loadingDialog); loadingDialog);
return; return;
} }
...@@ -107,14 +107,14 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -107,14 +107,14 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
//选择 当月下月以及流失会员 //选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() && if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
tempServerId != -1) { tempServerId != -1) {
mPresenter.sendTicker(tempServerId + "", null, mPresenter.sendTickerBefor(tempServerId + "", null,
null, tickerId, null, tickerId,
loadingDialog); loadingDialog);
return; return;
} }
} }
//选择金牌银牌等会员类别 //选择金牌银牌等会员类别
mPresenter.sendTicker(null, levelList.get(nowVipGroupId) mPresenter.sendTickerBefor(null, levelList.get(nowVipGroupId)
.getVipLevel() + "", .getVipLevel() + "",
null, tickerId, null, tickerId,
loadingDialog); loadingDialog);
...@@ -213,10 +213,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -213,10 +213,11 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mViewBinding.tvEmpty.setVisibility(View.VISIBLE); mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
mViewBinding.rlTicker.setVisibility(View.GONE); mViewBinding.rlTicker.setVisibility(View.GONE);
} }
if (trulePager != null && trulePager.getList() != null) { if (trulePager != null && trulePager.getList() != null && trulePager.getList().size() > 0) {
truleList = trulePager.getList(); truleList = trulePager.getList();
mViewBinding.tvEmpty.setVisibility(View.GONE); mViewBinding.tvEmpty.setVisibility(View.GONE);
mViewBinding.rlTicker.setVisibility(View.VISIBLE); mViewBinding.rlTicker.setVisibility(View.VISIBLE);
trulePager.getList().get(0).setSelect(true);
returnTicketAdapter.setNewData(trulePager.getList()); returnTicketAdapter.setNewData(trulePager.getList());
} }
} }
...@@ -263,11 +264,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -263,11 +264,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
if (nowtype == 0) { if (nowtype == 0) {
mPresenter.sendTickerSuccFragment.setUiData(truleList mPresenter.sendTickerSuccFragment.setUiData(truleList
.get(nowTickerItemId).getTruleName(), nowVip.getVipName()); .get(nowTickerItemId).getTruleName(), nowVip.getVipName());
}else { } else {
mPresenter.sendTickerSuccFragment.setUiData(truleList mPresenter.sendTickerSuccFragment.setUiData(truleList
.get(nowTickerItemId).getTruleName(), levelList.get(nowVipGroupId).getVipLevelName()); .get(nowTickerItemId).getTruleName(), levelList.get(nowVipGroupId)
.getVipLevelName());
} }
startWithPop(mPresenter.sendTickerSuccFragment); startWithPop(mPresenter.sendTickerSuccFragment);
} }
public void sendSuccBefor(long count) {
LogUtils.e("count-------------------------> " + count);
}
} }
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
View file @ f814ba6f
...@@ -66,6 +66,10 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT ...@@ -66,6 +66,10 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
mPresenter.searchVip(textView.getText().toString()); mPresenter.searchVip(textView.getText().toString());
return false; return false;
}); });
mViewBinding.etSearch.setFocusable(true);
mViewBinding.etSearch.setFocusableInTouchMode(true);
mViewBinding.etSearch.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/adapter/ReturnTicketAdapter.java
View file @ f814ba6f
...@@ -30,10 +30,9 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind ...@@ -30,10 +30,9 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
@Override @Override
protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) { protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money, // mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()))); // ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money, mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()))); ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date, mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ f814ba6f
...@@ -96,6 +96,9 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F ...@@ -96,6 +96,9 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
return false; return false;
}); });
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.tvTitle.setText("订单记录");
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
......
app/src/main/res/drawable/black_border_thr.xml
View file @ f814ba6f
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<stroke <stroke
android:width="1dp" android:width="1dp"
android:color="@color/black" /> android:color="@color/black_likui" />
<solid android:color="@color/all_transparent" /> <solid android:color="@color/all_transparent" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gray_r2.xml
View file @ f814ba6f
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/settle_btn_radius" /> <corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/gray_kongming" /> <solid android:color="@color/gray_kongming" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/layout/dialog_handover.xml
View file @ f814ba6f
...@@ -90,8 +90,8 @@ ...@@ -90,8 +90,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:weightSum="2" android:weightSum="2"
app:layout_constraintTop_toBottomOf="@id/view1"> app:layout_constraintTop_toBottomOf="@id/view1">
......
app/src/main/res/layout/dialog_prompt.xml
View file @ f814ba6f
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout> <layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<variable <variable
name="onClickListener" name="onClickListener"
type="android.view.View.OnClickListener"/> type="android.view.View.OnClickListener" />
</data> </data>
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/prompt_dialog_width" android:layout_width="@dimen/prompt_dialog_width"
android:layout_height="@dimen/prompt_dialog_height" android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/store_back" android:background="@color/white_caocao"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="@dimen/all_margin"> >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -33,74 +33,92 @@ ...@@ -33,74 +33,92 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<com.github.ybq.android.spinkit.SpinKitView <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/spin_kit" android:id="@+id/spin_kit"
style="@style/SpinKitView.Circle" style="@style/SpinKitView.Circle"
android:layout_width="@dimen/prompt_dialog_logo_size" android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size" android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:SpinKit_Color="@color/black"/> app:SpinKit_Color="@color/black" />
<ImageView <ImageView
android:id="@+id/iv_logo" android:id="@+id/iv_logo"
android:layout_width="@dimen/prompt_dialog_logo_size" android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size" android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:src="@mipmap/prompt_dialog_success"/> android:src="@mipmap/prompt_dialog_success" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp"> android:layout_height="@dimen/list2_height">
<TextView <TextView
android:id="@+id/tv_text" android:id="@+id/tv_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:text="正在处理，请稍后." android:text="正在处理，请稍后."
android:textColor="@color/succ" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/> android:textSize="@dimen/all_text_size" />
</ScrollView> </ScrollView>
<Button <Button
android:id="@+id/btn_custom" android:id="@+id/btn_custom"
style="@style/button_positive_allradius" style="@style/button_positive_allradius"
android:layout_width="@dimen/dialog_button_width" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin" android:text="重新获取" />
android:text="重新获取"/>
</LinearLayout> </LinearLayout>
<LinearLayout <android.support.constraint.ConstraintLayout
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/list2_height"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<Button <Button
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
style="@style/button_positive_bg_gray_noradius" style="@style/button_passive"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_weight="1" android:text="取消"
android:text="取消"/> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_ok"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
style="@style/button_positive_noradius" style="@style/button_positive"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_weight="1" android:text="确认"
android:text="确认"/> app:layout_constraintBottom_toBottomOf="parent"
</LinearLayout> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="@dimen/view_line_L050"
android:layout_height="match_parent"
android:background="@color/gray_huanggai"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_sendticker_befor.xml 0 → 100644
View file @ f814ba6f
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="@dimen/prompt_dialog_width"
android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/store_back"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="优惠券："
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_ticker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="50元"
android:textSize="@dimen/all_text_size_small"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="发送对象："
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_send_object"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="全部会员"
android:textSize="@dimen/all_text_size_small"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="发送张数："
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_send_count"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:text="5张"
android:textSize="@dimen/all_text_size_small"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_bale_index.xml
View file @ f814ba6f
...@@ -19,17 +19,13 @@ ...@@ -19,17 +19,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/gray_zhouyu"
android:focusable="true"
android:focusableInTouchMode="true"
tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity"> tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_title" android:id="@+id/cl_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:animateLayoutChanges="true"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:focusableInTouchMode="true"
app:layout_constraintBottom_toTopOf="@id/btn_add" app:layout_constraintBottom_toTopOf="@id/btn_add"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
...@@ -124,7 +120,7 @@ ...@@ -124,7 +120,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:text="添加获取规则" android:text="添加商品组合"
android:textColor="@color/red_guanyu" android:textColor="@color/red_guanyu"
android:textSize="@dimen/text_three_title"/> android:textSize="@dimen/text_three_title"/>
...@@ -145,7 +141,7 @@ ...@@ -145,7 +141,7 @@
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:text="共 2 个组合" android:text="共 2 个组合"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title" android:textSize="@dimen/text_three_title"
app:layout_constraintTop_toBottomOf="@+id/btn_add"/> app:layout_constraintTop_toBottomOf="@+id/btn_add"/>
<View <View
......
app/src/main/res/layout/fragment_inventory.xml
View file @ f814ba6f
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="共0人次盘库记录" android:text="共0人次盘库记录"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/fragment_inventory_add.xml
View file @ f814ba6f
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="@string/manage_inventory_add_title" android:text="@string/manage_inventory_add_title"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/fragment_myself.xml
View file @ f814ba6f
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:id="@+id/user_img" android:id="@+id/user_img"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
android:id="@+id/drop_down_fff" android:id="@+id/drop_down_fff"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
android:src="@mipmap/drop_down_fff" android:src="@mipmap/drop_down_fff"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
......
app/src/main/res/layout/fragment_order_main.xml
View file @ f814ba6f
...@@ -5,11 +5,26 @@ ...@@ -5,11 +5,26 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/white_caocao"
tools:context="com.example.administrator.tangkupos.CasherFragment"> tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout --> <!-- TODO: Update blank fragmfragment_integral_indexyout -->
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:layout_marginBottom="@dimen/padding_small"
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:textSize="@dimen/all_text_size_low"
android:layout_below="@id/tab_layout"
/>
<android.support.design.widget.TabLayout <android.support.design.widget.TabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
...@@ -26,7 +41,7 @@ ...@@ -26,7 +41,7 @@
android:id="@+id/viewPager_data" android:id="@+id/viewPager_data"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/tab_layout" android:layout_below="@id/ed_title"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:background="@color/gray"> android:background="@color/gray">
...@@ -38,6 +53,10 @@ ...@@ -38,6 +53,10 @@
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/viewPager_data" android:layout_above="@id/viewPager_data"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/ed_title"
android:background="@color/gray_huanggai" />
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_other_detail.xml
View file @ f814ba6f
...@@ -31,13 +31,13 @@ ...@@ -31,13 +31,13 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding_left_right" android:layout_marginBottom="@dimen/all_bounced_padding"
android:background="@drawable/singleline_white_gray" android:background="@drawable/singleline_white_gray"
android:paddingBottom="@dimen/all_padding"> android:paddingBottom="@dimen/all_padding">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" /> app:layout_constraintTop_toTopOf="@id/img_goods" />
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
android:id="@+id/tv_price" android:id="@+id/tv_price"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:textColor="@color/red_lvzhi" android:textColor="@color/red_lvzhi"
android:textSize="@dimen/big_text_size" android:textSize="@dimen/big_text_size"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -155,9 +155,9 @@ ...@@ -155,9 +155,9 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_stores" android:drawableStart="@mipmap/icon_stores"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding_left_right" android:paddingTop="@dimen/all_bounced_padding"
android:text="@{shopName}" android:text="@{shopName}"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -167,9 +167,9 @@ ...@@ -167,9 +167,9 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_address" android:drawableStart="@mipmap/icon_address"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding_left_right" android:paddingTop="@dimen/all_bounced_padding"
android:text="@{address}" android:text="@{address}"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -179,10 +179,10 @@ ...@@ -179,10 +179,10 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_telephone" android:drawableStart="@mipmap/icon_telephone"
android:paddingBottom="@dimen/all_padding_left_right" android:paddingBottom="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding_left_right" android:paddingTop="@dimen/all_bounced_padding"
android:text="@{phone}" android:text="@{phone}"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ f814ba6f
...@@ -73,16 +73,16 @@ ...@@ -73,16 +73,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/ly_title" android:layout_below="@id/ly_title"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/white_caocao"> android:background="@color/white_caocao">
<TextView <TextView
android:id="@+id/tv_supplier_title" android:id="@+id/tv_supplier_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="供货方" android:text="供货方"
android:textColor="@color/black" android:textColor="@color/black"
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toTopOf="@id/view_line_left_1"> app:layout_constraintTop_toTopOf="@id/view_line_left_1">
...@@ -213,9 +213,9 @@ ...@@ -213,9 +213,9 @@
android:id="@+id/tv_shop_title" android:id="@+id/tv_shop_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:text="定货方" android:text="定货方"
android:textColor="@color/black" android:textColor="@color/black"
...@@ -254,8 +254,8 @@ ...@@ -254,8 +254,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tv_shop_title"> app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
...@@ -355,8 +355,8 @@ ...@@ -355,8 +355,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop" app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop" app:layout_constraintStart_toStartOf="@id/ll_shop"
...@@ -384,8 +384,8 @@ ...@@ -384,8 +384,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop" app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop" app:layout_constraintStart_toStartOf="@id/ll_shop"
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:padding="@dimen/all_padding_left_right" android:padding="@dimen/all_bounced_padding"
android:text="定货明细" android:text="定货明细"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small_title" android:textSize="@dimen/all_text_size_small_title"
...@@ -513,7 +513,7 @@ ...@@ -513,7 +513,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title" android:layout_below="@id/ly_title"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
......
app/src/main/res/layout/fragment_send_succ_ticker.xml
View file @ f814ba6f
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="300dp" android:layout_height="300dp"
android:layout_margin="@dimen/all_padding" android:layout_margin="@dimen/all_margin"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
...@@ -136,6 +136,8 @@ ...@@ -136,6 +136,8 @@
<Button <Button
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin"
android:background="@drawable/red_border" android:background="@drawable/red_border"
android:onClick="@{OnClickListener}" android:onClick="@{OnClickListener}"
android:text="确 定" android:text="确 定"
......
app/src/main/res/layout/fragment_send_ticker.xml
View file @ f814ba6f
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_top" android:id="@+id/ll_top"
android:layout_above="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:orientation="vertical"> android:orientation="vertical">
<include <include
...@@ -51,15 +51,10 @@ ...@@ -51,15 +51,10 @@
android:id="@+id/ll_vip_single" android:id="@+id/ll_vip_single"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1.2" android:layout_weight="2"
android:onClick="@{OnClickListener}" android:onClick="@{OnClickListener}"
android:orientation="vertical"> android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"/>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_vip" android:id="@+id/cl_vip"
...@@ -149,11 +144,19 @@ ...@@ -149,11 +144,19 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_all" android:id="@+id/ll_all"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="wrap_content"
android:layout_weight="2"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:paddingLeft="@dimen/all_padding"
android:text="请选择发放对象"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/vip_type" android:id="@+id/vip_type"
...@@ -162,6 +165,15 @@ ...@@ -162,6 +165,15 @@
android:background="@color/white"/> android:background="@color/white"/>
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:paddingLeft="@dimen/all_padding"
android:text="请选择要发送的优惠券"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
<android.support.v7.widget.RecyclerView <android.support.v7.widget.RecyclerView
android:id="@+id/rl_ticker" android:id="@+id/rl_ticker"
...@@ -212,8 +224,8 @@ ...@@ -212,8 +224,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/red_border_allradius" android:background="@drawable/red_border_allradius"
android:text="发券"
android:onClick="@{OnClickListener}" android:onClick="@{OnClickListener}"
android:text="发券"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_send_ticker_vip.xml
View file @ f814ba6f
...@@ -61,9 +61,10 @@ ...@@ -61,9 +61,10 @@
android:id="@+id/et_search" android:id="@+id/et_search"
style="@style/searchBarEditor" style="@style/searchBarEditor"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="@dimen/all_seach_height"
android:layout_weight="1" android:layout_weight="1"
android:inputType="number" android:inputType="number"
android:maxLength="11"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai" android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"/> android:textSize="@dimen/all_text_size"/>
......
app/src/main/res/layout/item_announcement_detail.xml
View file @ f814ba6f
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/all_padding_left_right"> android:paddingBottom="@dimen/all_bounced_padding">
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
......
app/src/main/res/layout/item_bale_edit.xml
View file @ f814ba6f
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintStart_toEndOf="@id/iv_pic" app:layout_constraintStart_toEndOf="@id/iv_pic"
app:layout_constraintTop_toTopOf="@id/iv_pic"/> app:layout_constraintTop_toTopOf="@id/iv_pic"/>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<TextView <TextView
android:id="@+id/tv_money" android:id="@+id/tv_money"
android:layout_width="wrap_content" android:layout_width="@dimen/all_et_money_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="999" android:text="999"
android:textColor="@color/store_product_price" android:textColor="@color/store_product_price"
...@@ -98,9 +98,9 @@ ...@@ -98,9 +98,9 @@
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="visible" android:visibility="visible"
app:layout_constraintLeft_toRightOf="@+id/tv_money"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint" app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintLeft_toRightOf="@+id/tv_money">
<ImageButton <ImageButton
android:id="@+id/btn_down" android:id="@+id/btn_down"
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<EditText <EditText
android:id="@+id/et_shop_Num_edit" android:id="@+id/et_shop_Num_edit"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="@dimen/textview_height" android:layout_height="match_parent"
android:background="@drawable/selector_edit_frame_blue_background" android:background="@drawable/selector_edit_frame_blue_background"
android:digits="1234567890" android:digits="1234567890"
android:ems="5" android:ems="5"
...@@ -180,6 +180,8 @@ ...@@ -180,6 +180,8 @@
android:lines="1" android:lines="1"
android:maxLength="2" android:maxLength="2"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
/> />
......
app/src/main/res/layout/item_integral.xml
View file @ f814ba6f
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/all_margin"> android:padding="@dimen/all_padding">
<TextView <TextView
android:id="@+id/tv_vip_title" android:id="@+id/tv_vip_title"
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
android:layout_below="@+id/ll_vip" android:layout_below="@+id/ll_vip"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/all_margin"> android:padding="@dimen/all_padding">
<TextView <TextView
android:id="@+id/tv_source_title" android:id="@+id/tv_source_title"
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
android:layout_below="@+id/ll_source" android:layout_below="@+id/ll_source"
android:background="@color/white" android:background="@color/white"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/all_margin"> android:padding="@dimen/all_padding">
<TextView <TextView
android:id="@+id/tv_status_title" android:id="@+id/tv_status_title"
......
app/src/main/res/layout/item_inventory.xml
View file @ f814ba6f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
android:id="@+id/img" android:id="@+id/img"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
android:src="@mipmap/img_boss" android:src="@mipmap/img_boss"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:id="@+id/tv_name" android:id="@+id/tv_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding_left_right" android:layout_margin="@dimen/all_bounced_padding"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
android:id="@+id/tv_phone" android:id="@+id/tv_phone"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:text="" android:text=""
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" android:textSize="@dimen/all_text_size_low"
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
android:id="@+id/view_line" android:id="@+id/view_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_kongming" android:background="@color/gray_kongming"
app:layout_constraintTop_toBottomOf="@id/img" /> app:layout_constraintTop_toBottomOf="@id/img" />
......
app/src/main/res/layout/item_inventory_goods.xml
View file @ f814ba6f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
android:id="@+id/tv_goods_size" android:id="@+id/tv_goods_size"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:background="@drawable/frame_frame_zhouyu_bg" android:background="@drawable/frame_frame_zhouyu_bg"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="规格" android:text="规格"
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_cart_item_button_height" android:layout_height="@dimen/dialog_cart_item_button_height"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
style="@style/other_select_smallstyle" style="@style/other_select_smallstyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/dp_4" android:layout_marginTop="@dimen/dp_4"
android:text="构成数量：" android:text="构成数量："
android:textStyle="bold" android:textStyle="bold"
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
style="@style/other_select_smallstyle" style="@style/other_select_smallstyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:text="系统库存：" android:text="系统库存："
android:textStyle="bold" android:textStyle="bold"
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:background="@drawable/shape_red_round_rectangle_more_round" android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground" android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing" android:paddingBottom="@dimen/all_spacing"
......
app/src/main/res/layout/item_marketing_menu.xml
View file @ f814ba6f
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding_left_right" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/white" android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_padding_left_right" android:layout_marginRight="@dimen/all_bounced_padding"
android:src="@mipmap/right" /> android:src="@mipmap/right" />
<LinearLayout <LinearLayout
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv" android:layout_toLeftOf="@+id/iv"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding"> android:paddingTop="@dimen/all_padding">
<ImageView <ImageView
......
app/src/main/res/layout/item_other_select.xml
View file @ f814ba6f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" /> app:layout_constraintTop_toTopOf="@id/img_goods" />
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
android:id="@+id/tv_shop" android:id="@+id/tv_shop"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:drawableStart="@mipmap/icon_stores" android:drawableStart="@mipmap/icon_stores"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/item_replenishment.xml
View file @ f814ba6f
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
android:id="@+id/ll_boss" android:id="@+id/ll_boss"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
android:id="@+id/ll_date" android:id="@+id/ll_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
android:id="@+id/ll_no" android:id="@+id/ll_no"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:gravity="center" android:gravity="center"
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ f814ba6f
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕" android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
android:padding="@dimen/dp_4" android:padding="@dimen/dp_4"
android:text="规格" android:text="规格"
android:textSize="@dimen/all_text_size_small" android:textSize="@dimen/all_text_size_small"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code" app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" /> app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
......
app/src/main/res/layout/item_return_ticket.xml
View file @ f814ba6f
...@@ -12,20 +12,18 @@ ...@@ -12,20 +12,18 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_item" android:id="@+id/cl_item"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2.3"> android:layout_weight="1">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -33,68 +31,39 @@ ...@@ -33,68 +31,39 @@
android:background="@mipmap/return_ticket_one"/> android:background="@mipmap/return_ticket_one"/>
<LinearLayout <LinearLayout
android:id="@+id/ll_top" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="match_parent"
android:layout_height="0dp"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" android:orientation="horizontal">
android:padding="@dimen/all_padding"
app:layout_constraintBottom_toTopOf="@id/ll_bottom"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="4">
<ImageView <TextView
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="right" android:text="￥"
android:layout_weight="1.8" android:textStyle="bold"
android:src="@mipmap/bg_return_ticker_logo"/> android:layout_marginTop="@dimen/all_spacing_min"
android:textColor="@color/white"
android:textSize="@dimen/all_text_size_low"/>
<TextView <TextView
android:id="@+id/tv_ticket_money" android:id="@+id/tv_ticket_moneys"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="5"
android:gravity="center" android:gravity="center"
android:text="@string/tv_money" android:text="123.3"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/text_secondary_title" android:textSize="@dimen/text_primary_title_smile"
android:textStyle="bold"/> android:textStyle="bold"/>
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_top"
app:layout_constraintVertical_weight="2">
<TextView
android:id="@+id/tv_date"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="@dimen/all_margin"
android:text="@string/tv_date"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_send" android:id="@+id/cl_send"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"> android:layout_weight="2.3">
<ImageView <ImageView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -103,19 +72,20 @@ ...@@ -103,19 +72,20 @@
/> />
<TextView <TextView
android:id="@+id/tv_ticket_moneys" android:id="@+id/tv_rule"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:gravity="center" android:gravity="center"
android:text="@string/money" android:paddingTop="@dimen/all_spacing"
android:text="@string/tv_rule"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/text_primary_title_smile" android:textSize="@dimen/big_text_size"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/vw_line" app:layout_constraintBottom_toTopOf="@+id/vw_line"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>
<View <View
android:id="@+id/vw_line" android:id="@+id/vw_line"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -123,19 +93,22 @@ ...@@ -123,19 +93,22 @@
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1" android:background="@color/gray1"
app:layout_constraintBottom_toTopOf="@id/tv_rule" app:layout_constraintBottom_toTopOf="@id/tv_date"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_ticket_moneys"></View> app:layout_constraintTop_toBottomOf="@+id/tv_rule"></View>
<TextView <TextView
android:id="@+id/tv_rule" android:id="@+id/tv_date"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:text="@string/tv_rule" android:paddingBottom="@dimen/all_spacing"
android:paddingLeft="@dimen/all_margin"
android:text="@string/tv_date"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/dialog_inputPassWord_textsize_small"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
...@@ -147,9 +120,9 @@ ...@@ -147,9 +120,9 @@
android:id="@+id/iv_select" android:id="@+id/iv_select"
android:layout_width="30dp" android:layout_width="30dp"
android:layout_height="30dp" android:layout_height="30dp"
android:visibility="gone"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin" android:layout_marginRight="@dimen/all_margin"
android:src="@mipmap/but_elect02_stroke"/> android:src="@mipmap/but_elect02_stroke"
android:visibility="gone"/>
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/item_settle_vip.xml
View file @ f814ba6f
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
<variable <variable
name="name" name="name"
type="String" /> type="String"/>
<variable <variable
name="phone" name="phone"
type="String" /> type="String"/>
<variable <variable
name="disRate" name="disRate"
type="String" /> type="String"/>
</data> </data>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
app:placeholderImage="@mipmap/img_number01" app:placeholderImage="@mipmap/img_number01"
app:roundAsCircle="true" app:roundAsCircle="true"
app:roundingBorderColor="@color/gray_huanggai" app:roundingBorderColor="@color/gray_huanggai"
app:roundingBorderWidth="@dimen/all_line_width" /> app:roundingBorderWidth="@dimen/all_line_width"/>
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
android:layout_height="@dimen/settle_vip_level" android:layout_height="@dimen/settle_vip_level"
app:layout_constraintBottom_toBottomOf="@id/iv_head" app:layout_constraintBottom_toBottomOf="@id/iv_head"
app:layout_constraintRight_toRightOf="@id/iv_head" app:layout_constraintRight_toRightOf="@id/iv_head"
app:roundAsCircle="true" /> app:roundAsCircle="true"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -61,14 +61,14 @@ ...@@ -61,14 +61,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{name}" android:text="@{name}"
android:textColor="@color/black_zhangfei" android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{phone}" android:text="@{phone}"
android:textColor="@color/black_likui" android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" /> android:textSize="@dimen/all_caption_size"/>
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
android:textSize="@dimen/all_caption_size" android:textSize="@dimen/all_caption_size"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintRight_toLeftOf="@id/cb_point" app:layout_constraintRight_toLeftOf="@id/cb_point"
app:layout_constraintTop_toBottomOf="parent" /> app:layout_constraintTop_toBottomOf="parent"/>
<CheckBox <CheckBox
android:id="@+id/cb_point" android:id="@+id/cb_point"
...@@ -91,13 +91,13 @@ ...@@ -91,13 +91,13 @@
android:contentDescription="@string/settle_balance" android:contentDescription="@string/settle_balance"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent" /> app:layout_constraintTop_toBottomOf="parent"/>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</layout> </layout>
......
app/src/main/res/layout/item_statistics.xml
View file @ f814ba6f
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
android:layout_height="45dp" android:layout_height="45dp"
android:layout_marginBottom="@dimen/all_padding" android:layout_marginBottom="@dimen/all_padding"
android:layout_marginEnd="@dimen/all_padding" android:layout_marginEnd="@dimen/all_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
android:id="@+id/tv_left_top" android:id="@+id/tv_left_top"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_padding" android:paddingEnd="@dimen/all_padding"
android:text="1231231244124124" android:text="1231231244124124"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/item_string_head.xml
View file @ f814ba6f
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
android:background="@drawable/singleline_zhouyu_huanggai" android:background="@drawable/singleline_zhouyu_huanggai"
android:gravity="left" android:gravity="left"
android:paddingBottom="@dimen/all_padding" android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:singleLine="true" android:singleLine="true"
android:text="北京店" android:text="北京店"
......
app/src/main/res/layout/item_vip_group.xml
View file @ f814ba6f
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
android:padding="@dimen/all_padding" android:padding="@dimen/all_padding"
android:singleLine="true" android:singleLine="true"
android:text="全部会员" android:text="全部会员"
android:textColor="@color/black" android:textColor="@color/black_likui"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
......
app/src/main/res/layout/view_inventory_detail.xml
View file @ f814ba6f
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_margin"
android:padding="@dimen/dp_4"> android:padding="@dimen/dp_4">
......
app/src/main/res/layout/view_order_detail.xml
View file @ f814ba6f
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin"> android:layout_marginTop="@dimen/all_margin">
<LinearLayout <LinearLayout
...@@ -61,8 +61,8 @@ ...@@ -61,8 +61,8 @@
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4"> android:paddingTop="@dimen/dp_4">
<TextView <TextView
......
app/src/main/res/layout/view_ticket.xml
View file @ f814ba6f
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin"> android:layout_marginTop="@dimen/all_margin">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/layout/view_vip_recharge.xml
View file @ f814ba6f
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right" android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_padding_left_right" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_margin"> android:layout_marginTop="@dimen/all_margin">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white_caocao" android:background="@color/white_caocao"
android:paddingBottom="@dimen/dp_4" android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_padding_left_right" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/values/dimens.xml
View file @ f814ba6f
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
<dimen name="all_margin_big_big">40dp</dimen> <dimen name="all_margin_big_big">40dp</dimen>
<dimen name="all_margin_big">28dp</dimen> <dimen name="all_margin_big">28dp</dimen>
<dimen name="all_spacing">8dp</dimen> <dimen name="all_spacing">8dp</dimen>
<dimen name="all_spacing_min">5dp</dimen>
<dimen name="all_bounced_spacing">6dp</dimen>
<dimen name="all_bounced_padding">16dp</dimen>
<dimen name="all_sub_title_size">20sp</dimen> <dimen name="all_sub_title_size">20sp</dimen>
<dimen name="big_text_size">18sp</dimen> <dimen name="big_text_size">18sp</dimen>
<dimen name="big_big_text_size">20sp</dimen> <dimen name="big_big_text_size">20sp</dimen>
...@@ -24,7 +27,6 @@ ...@@ -24,7 +27,6 @@
<dimen name="all_title_size">26sp</dimen> <dimen name="all_title_size">26sp</dimen>
<dimen name="all_padding">10dp</dimen> <dimen name="all_padding">10dp</dimen>
<dimen name="all_seach_height">36dp</dimen> <dimen name="all_seach_height">36dp</dimen>
<dimen name="all_padding_left_right">16dp</dimen>
<dimen name="Minus_padding_left_right">-17dp</dimen> <dimen name="Minus_padding_left_right">-17dp</dimen>
<dimen name="all_text_size_big">22sp</dimen> <dimen name="all_text_size_big">22sp</dimen>
<dimen name="all_text_size_big_big">30sp</dimen> <dimen name="all_text_size_big_big">30sp</dimen>
...@@ -39,6 +41,8 @@ ...@@ -39,6 +41,8 @@
<dimen name="all_button_radius_height_min">35dp</dimen> <dimen name="all_button_radius_height_min">35dp</dimen>
<dimen name="all_button_radius_width">120dp</dimen> <dimen name="all_button_radius_width">120dp</dimen>
<dimen name="all_button_radius_height">40dp</dimen> <dimen name="all_button_radius_height">40dp</dimen>
<!--金额显示框-->
<dimen name="all_et_money_width">100dp</dimen>
<!--RADIUS--> <!--RADIUS-->
<dimen name="card_radius_medium">14dp</dimen> <dimen name="card_radius_medium">14dp</dimen>
<!--PADDING--> <!--PADDING-->
...@@ -65,8 +69,8 @@ ...@@ -65,8 +69,8 @@
<dimen name="dialog_button_width">190dp</dimen> <dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框--> <!--提示对话框-->
<dimen name="prompt_dialog_width">300dp</dimen> <dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">250dp</dimen> <dimen name="prompt_dialog_height">200dp</dimen>
<dimen name="prompt_dialog_logo_size">64dp</dimen> <dimen name="prompt_dialog_logo_size">48dp</dimen>
<!--商品页面--> <!--商品页面-->
<integer name="fragment_store_product_item_span_count">4</integer> <integer name="fragment_store_product_item_span_count">4</integer>
<integer name="fragment_store_group_item_span_count">7</integer> <integer name="fragment_store_group_item_span_count">7</integer>
......
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