Skip to content

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

Merge remote-tracking branch 'origin/master'

parents b68c92e5 3d2ec13b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 618 additions and 387 deletions
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ 3585e8f1
......@@ -70,7 +70,7 @@ public class App extends Application {
.start();
// 初始化异常处理
// initEx();
initEx();
//初始化Fragment框架
initFragment();
......@@ -118,7 +118,7 @@ public class App extends Application {
*/
private void initFragment() {
Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG)
Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
.handleException(e -> {
}).install();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ 3585e8f1
......@@ -8,11 +8,6 @@ import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.SPUtils;
import com.blankj.utilcode.util.ToastUtils;
import java.util.ArrayList;
import java.util.List;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityLoginBinding;
......@@ -22,12 +17,13 @@ import com.xingdata.zzdpos.ui.login.fragment.SignInFragment;
import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.view.PopupWindowDownList;
import java.util.ArrayList;
import java.util.List;
public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBinding> implements
LoginContract.View {
private long mExitTime;
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/adpter/EditDialogQueryShopItemAdapter.java
View file @ 3585e8f1
......@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.manage.bale.adpter;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemBaleEditQueryBinding;
import com.xingdata.zzdpos.model.Sssku;
......@@ -25,5 +24,6 @@ public class EditDialogQueryShopItemAdapter extends BaseAdapter<Sssku, ItemBaleE
mViewBinding.tvTitle.setText(item.getSpuName() + "");
mViewBinding.tvNo.setText(item.getSpuBarcode() + "");
mViewBinding.tvMoney.setText(ConvertUtil.fenToYuan(item.getSkuRetailPrice1()));
mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java
View file @ 3585e8f1
......@@ -25,6 +25,7 @@ import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.model.Ussku;
import com.xingdata.zzdpos.model.UsskuParam;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
import com.xingdata.zzdpos.ui.manage.bale.adpter.EditFragmentImgShopAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
......@@ -131,9 +132,27 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
}
break;
case R.id.btn_dismantling: {
//拆解商品
loadingDialog.show((BaseActivity) getActivity());
mPresenter.usskuDelete(ussku.getSkuId() + "", loadingDialog);
PromptDialog promptDialog = new PromptDialog();
promptDialog.setDialogType(PromptDialog
.PROMPTDIALOG_SELECT, "确定拆解？")
.setClick(new View.OnClickListener() {
@Override
public void onClick(View view) {
//拆解商品
loadingDialog.show((BaseActivity) getActivity());
mPresenter.usskuDelete(ussku.getSkuId() + "",
loadingDialog);
promptDialog.dismiss();
}
}, new View.OnClickListener() {
@Override
public void onClick(View view) {
promptDialog.dismiss();
}
}).show((BaseActivity) getActivity());
}
break;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachFragment.java
View file @ 3585e8f1
......@@ -3,16 +3,15 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment;
import android.annotation.SuppressLint;
import android.view.KeyEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentBaleSeachBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener;
/**
......@@ -68,16 +67,13 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
.getText()
.toString(),
loadingDialog);
pop();
pop();
return false;
}
}
);
mViewBinding.etKeyword.setFocusable(true);
mViewBinding.etKeyword.setFocusableInTouchMode(true);
mViewBinding.etKeyword.requestFocus();
KeyboardUtils.showSoftInput( mViewBinding.etKeyword);
Global.setFocus(mViewBinding.etKeyword, getActivity());
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachShopFragment.java
View file @ 3585e8f1
......@@ -6,7 +6,6 @@ import android.view.KeyEvent;
import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
......@@ -16,6 +15,7 @@ import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
import com.xingdata.zzdpos.ui.manage.bale.adpter.EditDialogQueryShopItemAdapter;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
......@@ -106,12 +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) {
nowData = newData;
isAddData = false;
......@@ -122,7 +120,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
queryShopItemAdapter.setNewData(nowData);
getEmptyView("没有数据");
}
Global.setFocus(mViewBinding.etKeyword, getActivity());
}
public void setAddData(List<Sssku> addData, Boolean isLoadMore) {
......@@ -135,6 +133,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
queryShopItemAdapter.addData(nowData);
getEmptyView("没有数据");
}
Global.setFocus(mViewBinding.etKeyword, getActivity());
}
/**
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
View file @ 3585e8f1
......@@ -10,7 +10,6 @@ import com.xingdata.zzdpos.databinding.ItemReturnTicketBinding;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerAddFragment;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.text.SimpleDateFormat;
......@@ -34,8 +33,7 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
// mViewBinding.tvSend.setText("\n");
// mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
// ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvTicketMoneys.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt()));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java
View file @ 3585e8f1
......@@ -29,7 +29,7 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
DialogTicketAddSettingBinding> {
LoadingDialog loadingDialog = new LoadingDialog();
//0：正常 1暂停
private byte nowStatus = 1;
private byte nowStatus = 0;
//当前编辑的对象
private Trule trule = new Trule();
//1为新增，2为更新
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketActivity.java
View file @ 3585e8f1
package com.xingdata.zzdpos.ui.sendticke;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
......@@ -9,6 +10,7 @@ import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment;
import java.util.List;
......@@ -57,11 +59,21 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
}
@Override
public void sendTickerBeforSucc(long count,LoadingDialog loadingDialog) {
public void sendTickerBeforSucc(long count, LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
mPresenter.sendTickerFragment.sendSuccBefor(count);
}
@Override
public void onBackPressedSupport() {
if (getTopFragment() instanceof SendTickerIndexFragment || getSupportFragmentManager()
.getFragments().size() <= 1) {
ActivityUtils.finishActivity(SendTicketActivity.class);
} else {
pop();
}
}
@Override
protected void onResume() {
super.onResume();
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/dialog/SendTickerBeforDialog.java
View file @ 3585e8f1
package com.xingdata.zzdpos.ui.sendticke.dialog;
import android.view.View;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.databinding.DialogSendtickerBeforBinding;
......@@ -11,14 +13,36 @@ import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
public class SendTickerBeforDialog extends BaseDialog<SendTicketPresenter,
DialogSendtickerBeforBinding> {
String tickerName, sendObject;
long count;
@Override
public int getLayoutId() {
return R.layout.dialog_sendticker_befor;
}
@Override
public int getTitle() {
return R.string.send_ticker_dialog_title;
}
@Override
public void initView() {
mViewBinding.tvTicker.setText(tickerName);
mViewBinding.tvSendObject.setText(sendObject);
mViewBinding.tvSendCount.setText(count + "张");
}
public void setData(String tickerName, String sendObject, long count) {
this.tickerName = tickerName;
this.sendObject = sendObject;
this.count = count;
}
@Override
public void onConfirmClick(View view) {
mPresenter.sendTickerFragment.sendTicker();
this.dismiss();
super.onConfirmClick(view);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @ 3585e8f1
......@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.sendticke.SendTicketActivity;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.ui.sendticke.adapter.ReturnTicketAdapter;
import com.xingdata.zzdpos.ui.sendticke.adapter.VipGroupAdapter;
import com.xingdata.zzdpos.ui.sendticke.dialog.SendTickerBeforDialog;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
......@@ -179,6 +180,42 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
}
}
//发券操作，对话框点击确认触发
public void sendTicker() {
long tickerId = truleList
.get(nowTickerItemId).getTruleMapId();
loadingDialog.show((BaseActivity) getActivity());
if (nowtype == 0) {
//单独会员发券
mPresenter.sendTicker(null, null, nowVip.getVipId(), tickerId,
loadingDialog);
} else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId();
if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
//选择全部会员
mPresenter.sendTicker(null, null, null, tickerId,
loadingDialog);
return;
}
for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
long tempServerId = SendTickerC.getServerId(tempLevelId);
//选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
tempServerId != -1) {
mPresenter.sendTicker(tempServerId + "", null,
null, tickerId,
loadingDialog);
return;
}
}
//选择金牌银牌等会员类别
mPresenter.sendTicker(null, levelList.get(nowVipGroupId)
.getVipLevel() + "",
null, tickerId,
loadingDialog);
}
}
private void initVipGroupData() {
mViewBinding.llVipSingle.setVisibility(View.GONE);
......@@ -274,6 +311,12 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
}
public void sendSuccBefor(long count) {
SendTickerBeforDialog sendTickerBeforDialog = new SendTickerBeforDialog();
sendTickerBeforDialog.setData(truleList
.get(nowTickerItemId).getTruleName(), mViewBinding.tvSelect.getText()
.toString(),
count);
sendTickerBeforDialog.show((BaseActivity) getActivity());
LogUtils.e("count-------------------------> " + count);
}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
View file @ 3585e8f1
......@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.List;
......@@ -21,6 +22,7 @@ import java.util.List;
public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendTickerVipBinding> {
private VipAdapter mVipAdapter;
@Override
public int getLayoutId() {
return R.layout.fragment_send_ticker_vip;
......@@ -41,7 +43,8 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
mPresenter.selectVip(mVipAdapter.getData().get(position));
mPresenter.sendTickerFragment = new com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerFragment();
mPresenter.sendTickerFragment = new com.xingdata.zzdpos.ui.sendticke.fragment
.SendTickerFragment();
mPresenter.sendTickerFragment.setNowtype(0);
mPresenter.sendTickerFragment.setNowVip(mVipAdapter.getData().get(position));
startWithPop(mPresenter.sendTickerFragment);
......@@ -66,10 +69,8 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
mPresenter.searchVip(textView.getText().toString());
return false;
});
mViewBinding.etSearch.setFocusable(true);
mViewBinding.etSearch.setFocusableInTouchMode(true);
mViewBinding.etSearch.requestFocus();
KeyboardUtils.showSoftInput(mViewBinding.etSearch);
Global.setFocus(mViewBinding.etSearch, getActivity());
// KeyboardUtils.showSoftInput(getActivity());
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/MsMainFragment.java
View file @ 3585e8f1
......@@ -23,7 +23,9 @@ import java.util.List;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
......@@ -84,46 +86,62 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
public void subscribe(ObservableEmitter<View> e) throws Exception {
e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
e.onComplete();
}
}).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<View>() {
int i = 0;
}).subscribeOn(Schedulers.newThread()).
observeOn(AndroidSchedulers.mainThread()).
subscribe(new Observer<View>() {
private int i = 0;
@Override
public void onSubscribe(Disposable d) {
}
@Override
public void onNext(View view) {
ItemStringBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
if (i == 0) {
itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
}
itemMenuBottomBinding.itemTv.setText(titleInts[i]);
itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
i++;
}
@Override
public void onError(Throwable e) {
}
@Override
public void onComplete() {
mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
textView.setText(tab.getText());
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
textView.setText(tab.getText());
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
});
@Override
public void accept(View view) throws Exception {
ItemStringBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
if (i == 0) {
itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
}
itemMenuBottomBinding.itemTv.setText(titleInts[i]);
itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
i++;
}
});
mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
textView.setText(tab.getText());
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
TextView textView = (TextView) tab.getCustomView().findViewById(R.id.item_tv);
textView.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL));
textView.setText(tab.getText());
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java
View file @ 3585e8f1
......@@ -136,14 +136,7 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
mFragmentStateAdapter = new FragmentStateAdapter(fragments, getChildFragmentManager());
mViewBinding.viewPagerData.setAdapter(mFragmentStateAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.viewPagerData);
if (mViewBinding.tabLayout.getSelectedTabPosition() != 0) {
new android.os.Handler().postDelayed(new Runnable() {
@Override
public void run() {
mViewBinding.viewPagerData.setCurrentItem(0, false);
}
}, 1);
}
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
......@@ -180,6 +173,16 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
}
});
new android.os.Handler().postDelayed(new Runnable() {
@Override
public void run() {
if (mViewBinding.tabLayout.getSelectedTabPosition() != 0) {
mViewBinding.viewPagerData.setCurrentItem(0, false);
}
}
}, 1);
}
......
app/src/main/java/com/xingdata/zzdpos/util/Global.java 0 → 100644
View file @ 3585e8f1
package com.xingdata.zzdpos.util;
import android.content.Context;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
/**
* Created by Administrator on 2018/1/17.
*/
public class Global {
private static void fragmentShowKeyboard(Context context) {
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context
.INPUT_METHOD_SERVICE);
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_NOT_ALWAYS);
}
public static void setFocus(View view, Context context) {
view.setFocusable(true);
view.setFocusableInTouchMode(true);
view.requestFocus();
Global.fragmentShowKeyboard(context);
}
}
app/src/main/res/drawable/radius_4dp_white.xml 0 → 100644
View file @ 3585e8f1
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="4dp" />
<solid android:color="@color/white" />
</shape>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_gray.xml 0 → 100644
View file @ 3585e8f1
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@color/gray_zhouyu"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/drawable/up_down_line_white.xml 0 → 100644
View file @ 3585e8f1
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:left="-2dp"
android:right="-2dp">
<shape>
<solid android:color="@android:color/white"/>
<stroke
android:width="0.5dp"
android:color="@color/gray_huanggai"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @ 3585e8f1
......@@ -146,7 +146,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text=" 个积分等于1元"
android:text=" 个积分=1元"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
......
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @ 3585e8f1
......@@ -68,6 +68,7 @@
android:background="@color/gray_huanggai"></View>
<LinearLayout
android:id="@+id/ll_rules_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
......@@ -129,6 +130,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:gravity="left"
android:orientation="horizontal">
<RadioButton
......@@ -140,6 +142,7 @@
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:gravity="left"
android:onClick="@{OnClickListener}"
android:text="暂停 "
android:textSize="@dimen/et_textsize"/>
......@@ -223,7 +226,7 @@
android:layout_marginRight="@dimen/all_margin"
android:layout_weight="5"
android:ems="10"
android:gravity="center"
android:gravity="left"
android:maxLength="5"
android:textColor="@color/black"
android:textColorHint="@color/hint"
......@@ -232,18 +235,11 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"
android:visibility="gone"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@drawable/up_down_line_white"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_padding">
......@@ -258,6 +254,7 @@
android:textSize="@dimen/et_textsize"/>
<RadioGroup
android:id="@+id/rg_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
......@@ -306,14 +303,22 @@
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<TextView
android:id="@+id/tv_type"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginRight="@dimen/all_margin"
android:layout_weight="5"
android:ems="10"
android:gravity="left"
android:maxLength="5"
android:textColor="@color/black"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"
android:visibility="gone"/>
</LinearLayout>
<LinearLayout
......@@ -418,19 +423,12 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:id="@+id/ll_category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@drawable/up_down_line_white"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
......@@ -458,7 +456,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="1.5"
android:layout_weight="1.6"
android:drawableRight="@mipmap/createstore_drop_down"
android:ellipsize="end"
android:gravity="center"
......@@ -476,7 +474,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/all_padding"
android:layout_weight="1.5"
android:layout_weight="1.6"
android:drawableRight="@mipmap/createstore_drop_down"
android:ellipsize="end"
android:gravity="center"
......@@ -495,7 +493,7 @@
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_bounced_padding"
android:layout_weight="1.5"
android:layout_weight="1.8"
android:drawableRight="@mipmap/createstore_drop_down"
android:ellipsize="end"
android:ems="10"
......@@ -512,13 +510,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginLeft="@dimen/all_padding"
android:layout_weight="4.5"
android:ellipsize="end"
android:ems="20"
android:gravity="center"
android:maxLength="20"
android:singleLine="true"
android:layout_marginRight="@dimen/all_margin"
android:layout_weight="5"
android:ems="@integer/all_content_weight"
android:gravity="left"
android:textColor="@color/black"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"
......@@ -682,15 +677,15 @@
<LinearLayout
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="@color/white">
<Button
android:id="@+id/btn_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@color/red_guanyu"
android:background="@drawable/red_border"
android:onClick="@{OnClickListener}"
android:text="确定"
android:textColor="@color/white"
......
app/src/main/res/layout/dialog_prompt.xml
View file @ 3585e8f1
......@@ -5,17 +5,17 @@
<variable
name="onClickListener"
type="android.view.View.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">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
......@@ -23,24 +23,35 @@
android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
android:textSize="@dimen/text_three_title"
android:paddingTop="@dimen/all_padding"
android:text="系统提示"
android:textColor="@color/black_baozheng"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/tv_title"
android:gravity="center"
android:orientation="vertical">
<com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/spin_kit"
style="@style/SpinKitView.Circle"
android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_bounced_padding"
android:visibility="gone"
app:SpinKit_Color="@color/black" />
android:id="@+id/spin_kit"
style="@style/SpinKitView.Circle"
android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_bounced_padding"
android:visibility="gone"
app:SpinKit_Color="@color/black"/>
<ImageView
android:id="@+id/iv_logo"
......@@ -61,7 +72,7 @@
android:gravity="center"
android:text="正在处理，请稍后."
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_text_size"/>
</ScrollView>
......@@ -71,7 +82,7 @@
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:layout_marginBottom="@dimen/all_bounced_padding"
android:text="重新获取" />
android:text="重新获取"/>
</LinearLayout>
......@@ -92,7 +103,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_ok"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<Button
android:id="@+id/btn_ok"
......@@ -103,21 +114,14 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="parent" />
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_kongming"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout>
......
app/src/main/res/layout/dialog_sendticker_befor.xml
View file @ 3585e8f1
......@@ -19,15 +19,15 @@
<RelativeLayout
android:layout_width="@dimen/prompt_dialog_width"
android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/store_back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
android:padding="@dimen/all_bounced_padding">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/ll_bottom"
android:gravity="center"
android:orientation="vertical">
......@@ -43,6 +43,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="优惠券："
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_low"/>
<TextView
......@@ -66,6 +67,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="发送对象："
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_low"/>
<TextView
......@@ -89,6 +91,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="发送张数："
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_low"/>
<TextView
......
app/src/main/res/layout/dialog_ticket_add_setting.xml
View file @ 3585e8f1
......@@ -88,7 +88,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:checkedButton="@id/rb_suspended"
android:checkedButton="@id/rb_start"
android:orientation="horizontal">
<RadioButton
......
app/src/main/res/layout/fragment_bale_edit.xml
View file @ 3585e8f1
......@@ -143,7 +143,7 @@
android:padding="@dimen/all_padding"
android:text="商品组合"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_big"/>
android:textSize="@dimen/text_secondary_title"/>
<Button
android:id="@+id/btn_dismantling"
......@@ -271,7 +271,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_left"
android:background="@color/gray_zhouyu"
android:background="@drawable/up_down_line_gray"
android:orientation="horizontal">
......@@ -303,16 +303,15 @@
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/ll_shop_composition"
android:orientation="vertical"
android:paddingLeft="@dimen/all_padding"
android:paddingRight="@dimen/all_padding"
android:paddingLeft="@dimen/all_bounced_spacing"
android:paddingRight="@dimen/all_bounced_spacing"
>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_shop_item_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/all_padding"></android.support.v7.widget.RecyclerView>
android:layout_height="match_parent"></android.support.v7.widget.RecyclerView>
</LinearLayout>
......
app/src/main/res/layout/fragment_bale_index.xml
View file @ 3585e8f1
......@@ -136,12 +136,12 @@
android:id="@+id/btn_group"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu"
android:background="@drawable/up_down_line_gray"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding"
android:text="共 2 个组合"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintTop_toBottomOf="@+id/btn_add"/>
<View
......
app/src/main/res/layout/fragment_bale_seach_shop.xml
View file @ 3585e8f1
......@@ -104,7 +104,7 @@
android:id="@+id/rv_shop_item"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack">
android:background="@color/gray_zhouyu">
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
......
app/src/main/res/layout/fragment_integral_main.xml
View file @ 3585e8f1
......@@ -13,6 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
......@@ -63,6 +64,7 @@
<RadioGroup
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/up_down_line_white"
android:checkedButton="@id/rb_get"
android:gravity="center"
android:orientation="horizontal">
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ 3585e8f1
......@@ -108,12 +108,7 @@
app:layout_constraintEnd_toEndOf="@id/tv_supplier_title"
app:layout_constraintTop_toTopOf="@id/tv_supplier_title" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_slight_line_width"
android:background="@color/gray_kongming"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintTop_toTopOf="@id/tv_supplier_title" />
<View
android:id="@+id/view_line_left_1"
......@@ -522,7 +517,6 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/ed_title"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" />
<View
......
app/src/main/res/layout/fragment_send_succ_ticker.xml
View file @ 3585e8f1
......@@ -11,63 +11,70 @@
</data>
<RelativeLayout
<LinearLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/ic_title"
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:id="@+id/ll_top"
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/ll_bottom"
android:layout_below="@+id/ic_title"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_margin="@dimen/all_margin"
android:background="@color/white"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<RelativeLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="@dimen/all_margin"
android:src="@mipmap/ic_succeed"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/iv"
android:layout_marginTop="@dimen/all_padding"
android:layout_marginTop="@dimen/all_margin"
android:gravity="center"
android:text="发券成功"
android:textSize="@dimen/text_three_title"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_sub_title_size"
android:textStyle="bold"/>
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/light_gray"></View>
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_kongming"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
......@@ -75,75 +82,90 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="优惠券："
android:textSize="@dimen/et_textsize"/>
android:text="优惠券"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"/>
<TextView
android:id="@+id/tv_ticker_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_body_size"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="发送对象："
android:textSize="@dimen/et_textsize"/>
android:text="发送对象"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"/>
<TextView
android:id="@+id/tv_send_ticker_user"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_body_size"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin"
android:layout_marginBottom="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="@dimen/all_textview_width"
android:layout_height="wrap_content"
android:text="发送时间："
android:textSize="@dimen/et_textsize"/>
android:text="发送时间"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size"/>
<TextView
android:id="@+id/tv_send_ticker_time"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:textSize="@dimen/et_textsize"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_body_size"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@drawable/shape_red_r1"
android:foreground="?android:attr/selectableItemBackground"
android:onClick="@{OnClickListener}"
android:text="确 定"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size"/>
</LinearLayout>
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin"
android:background="@drawable/red_border"
android:onClick="@{OnClickListener}"
android:text="确 定"
android:textColor="@color/white"
android:textSize="@dimen/three_grid_unit"/>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_ticker.xml
View file @ 3585e8f1
......@@ -50,8 +50,7 @@
<LinearLayout
android:id="@+id/ll_vip_single"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"
android:layout_height="wrap_content"
android:onClick="@{OnClickListener}"
android:orientation="vertical">
......@@ -59,9 +58,9 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_vip"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white_caocao"
android:layout_height="@dimen/list3_height"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white"
android:foreground="?android:attr/selectableItemBackground">
<com.facebook.drawee.view.SimpleDraweeView
......@@ -145,15 +144,18 @@
android:id="@+id/ll_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white"
android:orientation="vertical"
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:background="@drawable/up_down_line_white"
android:paddingBottom="@dimen/all_margin"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/all_margin"
android:text="请选择发放对象"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
......@@ -164,13 +166,17 @@
android:layout_height="wrap_content"
android:background="@color/white"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:paddingBottom="@dimen/all_margin"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/all_margin"
android:text="请选择要发送的优惠券"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
......@@ -203,7 +209,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_alignParentBottom="true"
android:background="@color/white"
android:background="@drawable/up_down_line_white"
android:gravity="center"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
......
app/src/main/res/layout/fragment_send_ticker_main.xml
View file @ 3585e8f1
......@@ -19,12 +19,13 @@
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:id="@+id/ll_one"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white"
android:layout_height="@dimen/list3_height"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:orientation="horizontal"
......@@ -57,9 +58,9 @@
<LinearLayout
android:id="@+id/ll_all"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white"
android:layout_height="@dimen/list3_height"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:orientation="horizontal"
......
app/src/main/res/layout/item_bale.xml
View file @ 3585e8f1
......@@ -11,9 +11,11 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_height="130dp"
android:background="@color/white"
android:foreground="?android:attr/selectableItemBackground">
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/all_bounced_spacing"
android:paddingTop="@dimen/all_bounced_spacing">
<!--<com.xingdata.zzdhd.ui.manager.bale.view.NineGridImageView-->
<!--android:id="@+id/iv_pic"-->
......@@ -30,14 +32,16 @@
<com.xingdata.zzdpos.ui.manage.bale.view.TribeAvatar
android:id="@+id/iv_pic"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="@dimen/all_margin"
android:layout_width="90dp"
android:layout_height="90dp"
android:layout_marginBottom="@dimen/all_bounced_spacing"
android:layout_marginLeft="@dimen/all_bounced_spacing"
android:layout_marginRight="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:background="@drawable/shape_black"
android:padding="2dp"
card_view:layout_constraintHorizontal_weight="1"
card_view:layout_constraintLeft_toLeftOf="parent"
card_view:layout_constraintBottom_toBottomOf="parent"
card_view:layout_constraintRight_toLeftOf="@id/ll_shop_message"
card_view:layout_constraintTop_toTopOf="parent">
......@@ -49,8 +53,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
android:gravity="center"
android:padding="@dimen/all_padding"
android:padding="@dimen/all_bounced_spacing"
card_view:layout_constraintBottom_toBottomOf="parent"
card_view:layout_constraintHorizontal_weight="1.5"
card_view:layout_constraintLeft_toRightOf="@id/iv_pic"
......@@ -61,6 +64,7 @@
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:ellipsize="end"
android:gravity="left"
android:lines="1"
......@@ -73,27 +77,29 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="条码："
android:textColor="@color/black_likui"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_barNo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="8531651233213"
android:textColor="@color/black_likui"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
......@@ -101,7 +107,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="原价："
android:textColor="@color/black_likui"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"/>
<RelativeLayout
android:layout_width="75dp"
......@@ -115,7 +122,8 @@
android:gravity="center"
android:singleLine="true"
android:text="@string/money"
android:textColor="@color/black_likui"/>
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"/>
<View
android:layout_width="match_parent"
......@@ -129,7 +137,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:orientation="horizontal">
<TextView
......
app/src/main/res/layout/item_bale_edit.xml
View file @ 3585e8f1
......@@ -11,14 +11,16 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginBottom="@dimen/all_padding"
android:foreground="?android:attr/selectableItemBackground">
android:layout_height="130dp"
android:foreground="?android:attr/selectableItemBackground"
android:paddingBottom="@dimen/all_bounced_spacing"
android:paddingTop="@dimen/all_bounced_spacing">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginLeft="@dimen/all_padding"
app:placeholderImage="@mipmap/icon_goods_default"/>
<TextView
......@@ -106,7 +108,7 @@
android:id="@+id/btn_down"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_padding"
android:layout_marginEnd="@dimen/all_bounced_spacing"
android:layout_weight="1"
android:background="@color/white"
android:onClick="@{onClick}"
......@@ -136,7 +138,7 @@
android:id="@+id/btn_up"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/all_padding"
android:layout_marginStart="@dimen/all_bounced_spacing"
android:layout_weight="1"
android:background="@color/white"
android:onClick="@{onClick}"
......@@ -189,7 +191,7 @@
android:id="@+id/btn_edit_ok"
android:layout_width="55dp"
android:layout_height="27dp"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginStart="@dimen/all_bounced_spacing"
android:background="@drawable/shape_black_solid_blue"
android:onClick="@{onClick}"
android:text="确定"
......@@ -203,7 +205,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:text="进价："
android:text="售价："
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_no_hint"
app:layout_constraintTop_toBottomOf="@id/tv_no_hint"/>
......
app/src/main/res/layout/item_bale_edit_query.xml
View file @ 3585e8f1
......@@ -11,19 +11,19 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="180dp"
android:background="@drawable/shape_black_solid_write"
android:layout_height="120dp"
android:layout_marginTop="@dimen/all_padding"
android:background="@drawable/up_down_line_white"
android:foreground="?android:attr/selectableItemBackground"
android:padding="@dimen/all_margin">
android:paddingBottom="@dimen/all_bounced_spacing"
android:paddingTop="@dimen/all_padding">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="@dimen/all_margin"
android:padding="@dimen/all_padding"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_marginLeft="@dimen/all_padding"
android:src="@mipmap/icon_qrcode"
card_view:layout_constraintBottom_toBottomOf="parent"
card_view:layout_constraintHorizontal_weight="1"
card_view:layout_constraintLeft_toLeftOf="parent"
card_view:layout_constraintRight_toLeftOf="@id/ll_shop_message"
......@@ -35,7 +35,6 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:orientation="vertical"
android:padding="@dimen/all_padding"
card_view:layout_constraintBottom_toBottomOf="parent"
card_view:layout_constraintHorizontal_weight="1.5"
card_view:layout_constraintLeft_toRightOf="@id/iv_pic"
......@@ -44,8 +43,10 @@
<TextView
android:id="@+id/tv_title"
style="@style/other_select_blacktext_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:ellipsize="end"
android:gravity="left"
android:lines="1"
......@@ -59,18 +60,32 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:gravity="center|left"
android:orientation="horizontal">
<TextView
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="条码："/>
android:layout_height="28dp"
android:text="条码："
/>
<TextView
android:id="@+id/tv_No"
android:layout_width="match_parent"
style="@style/other_select_smallstyle"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:text="8531651233213"/>
<TextView
android:id="@+id/tv_goods_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/frame_frame_zhouyu_bg"
android:padding="@dimen/dp_4"
android:text="规格"
android:textSize="@dimen/all_text_size_small"
/>
</LinearLayout>
......@@ -81,10 +96,10 @@
android:orientation="horizontal">
<TextView
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="售价："
android:textSize="@dimen/et_textsize"
android:textStyle="bold"/>
<TextView
......@@ -93,7 +108,7 @@
android:layout_height="wrap_content"
android:text="￥ 120.00"
android:textColor="@color/red"
android:textSize="@dimen/et_textsize"
android:textSize="@dimen/big_text_size"
android:textStyle="bold"/>
</LinearLayout>
......
app/src/main/res/layout/item_integral.xml
View file @ 3585e8f1
......@@ -5,7 +5,7 @@
android:id="@+id/cv_item"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_zhouyu"
android:orientation="horizontal">
......@@ -33,15 +33,18 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:layout_marginTop="55dp">
android:layout_marginTop="45dp"
android:background="@drawable/radius_4dp_white"
android:elevation="10dp"
android:padding="@dimen/all_bounced_padding">
<LinearLayout
android:id="@+id/ll_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:background="@color/white"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
android:orientation="horizontal">
<TextView
android:id="@+id/tv_vip_title"
......@@ -50,7 +53,7 @@
android:layout_weight="1"
android:text="适用会员"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_vip"
......@@ -60,7 +63,7 @@
android:gravity="right"
android:text="金牌会员"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
android:textSize="@dimen/all_text_size_low"/>
</LinearLayout>
<LinearLayout
......@@ -68,9 +71,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_vip"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:background="@color/white"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
android:orientation="horizontal">
<TextView
android:id="@+id/tv_source_title"
......@@ -79,7 +82,7 @@
android:layout_weight="1"
android:text="来源品类"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"
android:textSize="@dimen/all_text_size_low"
/>
<TextView
......@@ -91,7 +94,7 @@
android:singleLine="true"
android:text="金牌会员"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
android:textSize="@dimen/all_text_size_low"/>
</LinearLayout>
<LinearLayout
......@@ -99,9 +102,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_source"
android:layout_marginTop="@dimen/all_bounced_spacing"
android:background="@color/white"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
android:orientation="horizontal">
<TextView
android:id="@+id/tv_status_title"
......@@ -110,7 +113,7 @@
android:layout_weight="1"
android:text="启用状态"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
android:textSize="@dimen/all_text_size_low"/>
<TextView
android:id="@+id/tv_status"
......@@ -120,7 +123,7 @@
android:gravity="right"
android:text="启用状态"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
android:textSize="@dimen/all_text_size_low"/>
</LinearLayout>
</RelativeLayout>
......
app/src/main/res/layout/item_inventory.xml
View file @ 3585e8f1
......@@ -61,7 +61,7 @@
android:id="@+id/tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/singleline_white_gray"
android:background="@color/white_caocao"
android:paddingTop="@dimen/all_padding"
android:paddingEnd="@dimen/all_padding"
android:paddingBottom="@dimen/all_padding"
......@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/all_padding"
android:background="@drawable/singleline_white_gray"
android:background="@color/white_caocao"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_low"
android:textStyle="bold"
......@@ -87,7 +87,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/singleline_white_gray"
android:background="@color/white_caocao"
android:padding="@dimen/all_padding"
android:text="盘点件数："
android:textColor="@color/black"
......@@ -100,7 +100,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@drawable/singleline_white_gray"
android:background="@color/white_caocao"
android:padding="@dimen/all_padding"
android:text="盘点结果："
android:textColor="@color/black"
......@@ -114,7 +114,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding"
android:background="@drawable/singleline_white_gray"
android:background="@color/white_caocao"
android:padding="@dimen/all_padding"
android:paddingEnd="@dimen/all_margin"
android:text="不相符"
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ 3585e8f1
......@@ -205,6 +205,7 @@
android:layout_marginTop="@dimen/all_padding"
android:text="进价："
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_stock_hint"
app:layout_constraintTop_toBottomOf="@id/tv_stock_hint" />
......
app/src/main/res/values/dimens.xml
View file @ 3585e8f1
......@@ -42,7 +42,7 @@
<dimen name="all_button_radius_width">120dp</dimen>
<dimen name="all_button_radius_height">40dp</dimen>
<!--金额显示框-->
<dimen name="all_et_money_width">100dp</dimen>
<dimen name="all_et_money_width">80dp</dimen>
<!--RADIUS-->
<dimen name="card_radius_medium">14dp</dimen>
<!--PADDING-->
......
app/src/main/res/values/strings.xml
View file @ 3585e8f1
......@@ -498,6 +498,8 @@
<string name="menu_ms_sms">群发短信</string>
<string name="menu_ticket">发券</string>
<string name="send_ticker_dialog_title">确认发送优惠券？</string>
<string name="menu_statistics">统计</string>
<string name="menu_statistics_order">订单统计</string>
......
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