Commit 21eaf788 authored by 王海's avatar 王海

Merge remote-tracking branch 'origin/master'

parents 34cca944 1708d114
<component name="ProjectDictionaryState">
<dictionary name="Eurus">
<words>
<w>baozheng</w>
<w>caocao</w>
<w>guanyu</w>
<w>huanggai</w>
<w>inputer</w>
<w>likui</w>
<w>mawu</w>
<w>xishi</w>
<w>zhangfei</w>
<w>zhouyu</w>
</words>
</dictionary>
</component>
\ No newline at end of file
......@@ -2,6 +2,5 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/TangKuPos" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -15,33 +15,41 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:name=".ui.main.MainActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/main_title"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
<activity
android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme">
android:windowSoftInputMode="adjustUnspecified|stateHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme">
</activity>
<activity
android:name=".ui.login.LoginActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden"/>
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity
android:name=".ui.exception.ErrorDialogActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/Theme.AppCompat.Light.Dialog"/>
android:theme="@style/Theme.AppCompat.Light.Dialog" />
<activity
android:name=".ui.exception.ServerErrActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/Theme.AppCompat.Light.Dialog"/>
android:theme="@style/Theme.AppCompat.Light.Dialog" />
<activity
android:name=".ui.payment.PaymentActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
</application>
</manifest>
\ No newline at end of file
......@@ -69,8 +69,8 @@ public class App extends Application {
.callback(this)
.start();
// 初始化异常处理
initEx();
// 初始化异常处理
// initEx();
//初始化Fragment框架
initFragment();
......@@ -147,16 +147,14 @@ public class App extends Application {
}
public static void reStartApp() {
// 重启
Intent intent = new Intent(instance.getApplicationContext(), SplashActivity
.class);
@SuppressLint("WrongConstant") PendingIntent restartIntent = PendingIntent.getActivity
(instance
.getApplicationContext(), 0, intent,
Intent.FLAG_ACTIVITY_NEW_TASK);
.getApplicationContext(), 0, intent,
Intent.FLAG_ACTIVITY_NEW_TASK);
AlarmManager mgr = (AlarmManager) instance.getSystemService(Context
.ALARM_SERVICE);
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 1, restartIntent); //
......
......@@ -7,6 +7,15 @@ package com.xingdata.zzdpos;
*/
public class C {
public final class MENU {
public static final int MENU_VIP = 101;
public static final int MENU_RECHARGE = 102;
public static final int MENU_MS = 103;
public static final int MENU_TICKET = 104;
public static final int MENU_STATISTICS = 105;
public static final int MENU_MANAGER = 106;
}
public final class HEAD {
public static final String USER_AGENT = "UrlConnection - ZZDHttpClient V1.0";
......
package com.xingdata.zzdpos;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(com.xingdata.zzdpos.R.layout.activity_main);
}
}
......@@ -3,7 +3,6 @@ package com.xingdata.zzdpos.ui.login;
import android.content.Intent;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.LogUtils;
......@@ -13,8 +12,7 @@ import com.blankj.utilcode.util.ToastUtils;
import java.util.ArrayList;
import java.util.List;
import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.MainActivity;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityLoginBinding;
......
package com.xingdata.zzdpos.ui.main;
import android.app.Activity;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityMainBinding;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
import java.util.ArrayList;
import java.util.List;
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> {
private int[] titleInts={R.string.menu_cashier,R.string.menu_service,R.string.menu_myself};
private int[] iconList ={R.mipmap.icon_menu_cashier_1,R.mipmap.icon_menu_service_0,R.mipmap.icon_menu_myself_0};
private FragmentPagerAdapter mFragmentPagerAdapter;
@Override
public int getLayoutId() {
return R.layout.activity_main;
}
@Override
public void initView() {
List<Fragment> fragments = new ArrayList<>();
fragments.add(new CasherFragment());
fragments.add(new CasherFragment());
fragments.add(new CasherFragment());
mFragmentPagerAdapter = new FragmentViewAdapter(fragments, getSupportFragmentManager());
mViewBinding.fragmentContainer.setAdapter(mFragmentPagerAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.fragmentContainer);
setupTabIcons();
mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
switch (tab.getPosition()) {
case 0:
tab.setIcon(R.mipmap.icon_menu_cashier_1);
break;
case 1:
tab.setIcon(R.mipmap.icon_menu_service_1);
break;
case 2:
tab.setIcon(R.mipmap.icon_menu_myself_1);
break;
}
}
@Override
public void onTabUnselected(TabLayout.Tab tab) {
switch (tab.getPosition()) {
case 0:
tab.setIcon(R.mipmap.icon_menu_cashier_0);
break;
case 1:
tab.setIcon(R.mipmap.icon_menu_service_0);
break;
case 2:
tab.setIcon(R.mipmap.icon_menu_myself_0);
break;
}
}
@Override
public void onTabReselected(TabLayout.Tab tab) {
}
});
}
private void setupTabIcons() {
for (int i = 0; i < 3; i++) {
mViewBinding.tabLayout.getTabAt(i).setIcon(iconList[i]).setText(titleInts[i]);
}
}
}
package com.xingdata.zzdpos.ui.main.adapter;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import java.util.List;
/**
* Created by Administrator on 2017/12/20.
*/
public class FragmentViewAdapter extends FragmentPagerAdapter {
private List<Fragment> fragmentList;
public FragmentViewAdapter(List<Fragment> fragmentList, FragmentManager fm) {
super(fm);
this.fragmentList = fragmentList;
}
@Override
public Fragment getItem(int position) {
return fragmentList.get(position);
}
@Override
public int getCount() {
return fragmentList.size();
}
}
package com.xingdata.zzdpos.ui.main.adapter;
import android.content.Context;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemMenuDetailBinding;
import java.util.List;
/**
* Created by Administrator on 2017/12/21.
*/
public class MenuRecyclerAdapter extends BaseAdapter<Integer, ItemMenuDetailBinding> {
private List<Integer> integers;
private Context mContext;
private Integer titleId;
private Integer imgId;
public MenuRecyclerAdapter(Context mContext, @Nullable List<Integer> integers) {
super(R.layout.item_menu_detail, integers);
this.mContext = mContext;
this.integers = integers;
}
@Override
protected void convert(ItemMenuDetailBinding mViewBinding, Integer item) {
switch (item) {
case C.MENU.MENU_VIP://会员
titleId = R.string.menu_vip;
imgId = R.mipmap.icon_members;
break;
case C.MENU.MENU_RECHARGE://充值
titleId = R.string.menu_recharge;
imgId = R.mipmap.icon_recharge;
break;
case C.MENU.MENU_MS://营销
titleId = R.string.menu_ms;
imgId = R.mipmap.icon_marketing;
break;
case C.MENU.MENU_TICKET://优惠券
titleId = R.string.menu_ticket;
imgId = R.mipmap.icon_sendstamps;
break;
case C.MENU.MENU_STATISTICS://统计
titleId = R.string.menu_statistics;
imgId = R.mipmap.icon_statistics;
break;
case C.MENU.MENU_MANAGER://管理
titleId = R.string.menu_manager;
imgId = R.mipmap.icon_administer;
break;
}
mViewBinding.text.setText(titleId);
mViewBinding.img.setImageResource(imgId);
}
}
package com.xingdata.zzdpos.ui.main.fragment;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import java.util.ArrayList;
import java.util.List;
public class CasherFragment extends BaseFragment<MainPresenter,FragmentCasherBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
@Override
public int getLayoutId() {
return R.layout.fragment_casher;
}
@Override
public void initView() {
mViewBinding.fragmentCasherRecycler.setLayoutManager(new GridLayoutManager(getActivity(), 2));
integers = new ArrayList<>();
integers.add(101);
integers.add(102);
integers.add(103);
integers.add(104);
integers.add(105);
integers.add(106);
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
// mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyItemDecoration(getActivity(), 2, R.color.black_zhangfei));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch ((int)adapter.getData().get(position)) {
case C.MENU.MENU_VIP://会员
break;
case C.MENU.MENU_RECHARGE://充值
break;
case C.MENU.MENU_MS://营销
break;
case C.MENU.MENU_TICKET://优惠券
break;
case C.MENU.MENU_STATISTICS://统计
break;
case C.MENU.MENU_MANAGER://管理
break;
}
}
});
}
}
package com.xingdata.zzdpos.ui.payment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityPaymentBinding;
import com.xingdata.zzdpos.ui.payment.fragment.PaymentFragment;
public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding> implements PaymentContract.View {
private PaymentFragment mPaymentFragment = new PaymentFragment();
@Override
public int getLayoutId() {
return R.layout.activity_payment;
}
@Override
public void initView() {
loadRootFragment(R.id.f_payment, mPaymentFragment);
}
}
package com.xingdata.zzdpos.ui.payment;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
interface PaymentContract {
interface View extends BaseView {
}
abstract class Presenter extends BasePresenter<PaymentContract.View> {
}
}
\ No newline at end of file
package com.xingdata.zzdpos.ui.payment;
public class PaymentPresenter extends PaymentContract.Presenter {
@Override
public void onAttached() {
}
}
package com.xingdata.zzdpos.ui.payment.fragment;
import com.blankj.utilcode.util.LogUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentPaymentBinding;
import com.xingdata.zzdpos.ui.payment.PaymentPresenter;
import com.xingdata.zzdpos.ui.payment.view.CalculatorView;
import com.xingdata.zzdpos.util.ConvertUtil;
public class PaymentFragment extends BaseFragment<PaymentPresenter, FragmentPaymentBinding> {
private CalculatorView mCalculatorView = new CalculatorView();
@Override
public int getLayoutId() {
return R.layout.fragment_payment;
}
@Override
public void initView() {
loadRootFragment(R.id.f_inputer, mCalculatorView);
mCalculatorView.setmOnResultChangeListener((exp, result) -> {
LogUtils.e(exp + "\n" + result);
});
mCalculatorView.setmOnSettleClickListener(result -> {
LogUtils.e(ConvertUtil.fenToYuan(result));
});
}
}
package com.xingdata.zzdpos.ui.payment.view;
import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.ViewCalculatorBinding;
import com.xingdata.zzdpos.ui.payment.PaymentPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import java.math.BigDecimal;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculatorBinding> {
private String mExp;
private String mValue;
private OnResultChangeListener mOnResultChangeListener;
private onSettleClickListener mOnSettleClickListener;
public CalculatorView() {
mExp = "";
mValue = "";
}
public interface OnResultChangeListener {
void onResultChange(String exp, Long result);
}
public interface onSettleClickListener {
void onSettleClick(Long result);
}
@Override
public int getLayoutId() {
return R.layout.view_calculator;
}
@Override
public void initView() {
View.OnClickListener mOnClickListener = view -> {
switch (view.getId()) {
case R.id.btn_del:
delete();
break;
case R.id.btn_clear:
clear();
break;
case R.id.btn_settle:
settle();
break;
default:
if (view instanceof TextView) {
String str = ((TextView) view).getText().toString();
if (mExp.length() == 0 && str.matches("[+\\-*/]")) return;
if (mExp.length() == 0 && str.equals(".")) mExp += "0";
if (mValue.length() > 0 && str.matches("[+\\-*/]")) {
mValue = "";
} else {
if (mValue.contains(".") && str.matches("[.]")) return;
mValue += str;
String[] _values = mValue.split("[.]");
if (_values.length > 1) {
if (_values[1].length() > 2) return;
}
}
mExp += str;
}
break;
}
if (mOnResultChangeListener != null) {
mOnResultChangeListener.onResultChange(mExp, ConvertUtil.yuanToFen(parseExp(mExp)));
}
};
mViewBinding.setOnClick(mOnClickListener);
}
/**
* 删除
*/
private void delete() {
mExp = mExp.substring(0, mExp.length() - 1);
}
/**
* 结账
*/
private void settle() {
if (mOnSettleClickListener != null) {
mOnSettleClickListener.onSettleClick(ConvertUtil.yuanToFen(parseExp(mExp)));
}
}
/**
* 清空
*/
private void clear() {
mExp = "";
if (mOnResultChangeListener != null) {
mOnResultChangeListener.onResultChange(mExp, ConvertUtil.yuanToFen(parseExp(mExp)));
}
}
/**
* 解析计算四则运算表达式,例:2+((3+4)*2-22)/2*3
*
* @param exp 算式
* @return 结果
*/
public static String parseExp(String exp) {
exp = exp.replaceAll("\\s+", "")
.replaceAll("^\\((.+)\\)$", "$1")
.replaceAll("[\\s+-/*.]+$", "")
.replaceAll("×", "*").replaceAll("÷", "/");
String minExp = "^((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[+\\-*/]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))$";
if (exp.matches(minExp)) {
String result = calculate(exp);
return Double.parseDouble(result) >= 0 ? result : "[" + result + "]";
} else if (exp.matches("[0-9.]+")) {
return exp;
} else if (exp.length() == 0) {
return "0";
}
String noParentheses = "^[^()]+$";
String priorOperatorExp = "(((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[*/]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?])))";
String operatorExp = "(((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[+\\-]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?])))";
if (exp.matches(noParentheses)) {
Pattern patt = Pattern.compile(priorOperatorExp);
Matcher mat = patt.matcher(exp);
if (mat.find()) {
String tempMinExp = mat.group();
exp = exp.replaceFirst(priorOperatorExp, parseExp(tempMinExp));
} else {
patt = Pattern.compile(operatorExp);
mat = patt.matcher(exp);
if (mat.find()) {
String tempMinExp = mat.group();
exp = exp.replaceFirst(operatorExp, parseExp(tempMinExp));
}
}
return parseExp(exp);
}
String minParentheses = "\\([^()]+\\)";
Pattern patt = Pattern.compile(minParentheses);
Matcher mat = patt.matcher(exp);
if (mat.find()) {
String tempMinExp = mat.group();
exp = exp.replaceFirst(minParentheses, parseExp(tempMinExp));
}
System.out.println("expression" + exp);
return parseExp(exp);
}
/**
* 计算最小单位四则运算表达式(两个数字)
*
* @param exp 算式
* @return 结果
*/
public static String calculate(String exp) {
exp = exp.replaceAll("[\\[\\]]", "");
String number[] = exp.replaceFirst("(\\d)[+\\-*/]", "$1,").split(",");
BigDecimal number1 = new BigDecimal(number[0]);
BigDecimal number2 = new BigDecimal(number[1]);
BigDecimal result = null;
String operator = exp.replaceFirst("^.*\\d([+\\-*/]).+$", "$1");
if ("+".equals(operator)) {
result = number1.add(number2);
} else if ("-".equals(operator)) {
result = number1.subtract(number2);
} else if ("*".equals(operator)) {
result = number1.multiply(number2);
} else if ("/".equals(operator)) {
result = number1.divide(number2, 2, BigDecimal.ROUND_HALF_UP);
}
return result != null ? result.toString() : null;
}
public void setmOnResultChangeListener(OnResultChangeListener mOnResultChangeListener) {
this.mOnResultChangeListener = mOnResultChangeListener;
}
public void setmOnSettleClickListener(onSettleClickListener mOnSettleClickListener) {
this.mOnSettleClickListener = mOnSettleClickListener;
}
}
......@@ -7,7 +7,7 @@ import android.view.animation.AlphaAnimation;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils;
import com.github.ybq.android.spinkit.style.FadingCircle;
import com.xingdata.zzdpos.MainActivity;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivitySplashBinding;
......
package com.xingdata.zzdpos.util;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.drawable.Drawable;
import android.support.v7.widget.RecyclerView;
import android.view.View;
/**
* Created by Administrator on 2017/12/21.
*/
class MyItemDecoration extends RecyclerView.ItemDecoration {
private Drawable mDividerDarwable;
private int mDividerHight = 1;
private Paint mColorPaint;
private int size=2;
public final int[] ATRRS = new int[]{android.R.attr.listDivider};
public MyItemDecoration(Context context) {
final TypedArray ta = context.obtainStyledAttributes(ATRRS);
this.mDividerDarwable = ta.getDrawable(0);
ta.recycle();
}
/*
int dividerHight 分割线的线宽
int dividerColor 分割线的颜色
*/
public MyItemDecoration(Context context, int dividerHight, int dividerColor) {
this(context);
mDividerHight = dividerHight;
mColorPaint = new Paint();
mColorPaint.setColor(dividerColor);
}
/*
int dividerHight 分割线的线宽
int dividerColor 分割线的颜色
*/
public MyItemDecoration(Context context, int dividerHight, int dividerColor, int size) {
this(context);
mDividerHight = dividerHight;
mColorPaint = new Paint();
mColorPaint.setColor(dividerColor);
this.size=size;
}
/*
int dividerHight 分割线的线宽
Drawable dividerDrawable 图片分割线
*/
public MyItemDecoration(Context context, int dividerHight, Drawable dividerDrawable) {
this(context);
mDividerHight = dividerHight;
mDividerDarwable = dividerDrawable;
}
@Override
public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
super.onDraw(c, parent, state);
//画水平和垂直分割线
drawHorizontalDivider(c, parent);
drawVerticalDivider(c, parent);
}
public void drawVerticalDivider(Canvas c, RecyclerView parent) {
final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) {
final View child = parent.getChildAt(i);
final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
final int top = child.getTop() - params.topMargin+30;
final int bottom = child.getBottom() + params.bottomMargin-30;
int left = 0;
int right = 0;
//左边第一列
if ((i % size) == 0) {
//item左边分割线
// left = child.getLeft();
// right = left + mDividerHight;
// mDividerDarwable.setBounds(left, top, right, bottom);
// mDividerDarwable.draw(c);
//item右边分割线
left = child.getRight() + params.rightMargin - mDividerHight;
right = left + mDividerHight;
}
//画分割线
mDividerDarwable.setBounds(left, top, right, bottom);
mDividerDarwable.draw(c);
if (mColorPaint != null) {
c.drawRect(left, top, right, bottom, mColorPaint);
}
}
}
public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) {
final View child = parent.getChildAt(i);
RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
final int left = child.getLeft() - params.leftMargin - mDividerHight;
final int right = child.getRight() + params.rightMargin;
int top = 0;
int bottom = 0;
// // 最上面一行
// if ((i / size) == 0) {
//// //当前item最上面的分割线
//// top = child.getTop();
//// //当前item下面的分割线
//// bottom = top + mDividerHight;
//// mDividerDarwable.setBounds(left, top, right, bottom);
//// mDividerDarwable.draw(c);
// if (mColorPaint != null) {
// c.drawRect(left, top, right, bottom, mColorPaint);
// }
// top = child.getBottom() + params.bottomMargin;
// bottom = top + mDividerHight;
// } else {
// if (i!=)
top = child.getBottom() + params.bottomMargin;
bottom = top + mDividerHight;
// }
//画分割线
mDividerDarwable.setBounds(left, top, right, bottom);
mDividerDarwable.draw(c);
if (mColorPaint != null) {
c.drawRect(left, top, right, bottom, mColorPaint);
}
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.xingdata.zzdpos.MainActivity">
<layout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.xingdata.zzdpos.ui.main.MainActivity">
</android.support.constraint.ConstraintLayout>
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@color/white_caocao"
android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:tabIndicatorHeight="0dp"
app:tabTextAppearance="@android:style/TextAppearance.Holo.Small">
</android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/tab_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</android.support.v4.view.ViewPager>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<Toolbar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/store_product_bg"
android:title="收款"
android:titleTextColor="@color/white" />
<FrameLayout
android:id="@+id/f_payment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</layout>
\ No newline at end of file
<layout>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragment layout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/black"
android:gravity="center"
android:paddingTop="30dp"
android:weightSum="2"
app:layout_constraintBottom_toBottomOf="@id/guideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/icon_receivables"
android:gravity="center"
android:text="@string/menu_receivables"
android:textColor="#FFF" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/icon_billing"
android:gravity="center"
android:text="@string/menu_billing"
android:textColor="#FFF" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/fragment_casher_recycler"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/gray_zhouyu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:background="@color/store_product_bg"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white"
android:gravity="end|center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="小计:" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="40.00"
android:textColor="@color/deep_red" />
</LinearLayout>
<FrameLayout
android:id="@+id/f_inputer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="7" />
</LinearLayout>
</layout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="25dp"
android:paddingBottom="25dp"
android:gravity="center"
android:elevation="0.5dp"
android:background="@color/white_caocao"
android:layout_margin="0.8dp"
android:orientation="vertical">
<ImageView
android:id="@+id/img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"/>
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</layout>
This diff is collapsed.
......@@ -117,4 +117,12 @@
<color name="light_grey">#b9b9b9</color>
<color name="red_guanyu">#b4282d</color>
<color name="red_xishi">#e57b7b</color>
<color name="gray_zhouyu">#f1f3f7</color>
<color name="gray_huanggai">#afb9c3</color>
<color name="white_caocao">#ffffff</color>
<color name="black_zhangfei">#233142</color>
<color name="black_baozheng">#121212</color>
<color name="black_likui">#646464</color>
<color name="blue_mawu">#3f75a2</color>
</resources>
......@@ -264,14 +264,7 @@
<string name="order_cashier">收银员:%s</string>
<string name="order_states">%s/%s</string>
<string name="title_activity_splash">SplashActivity</string>
<!--菜单界面-->
<string name="menu_checkstand">收银台</string>
<string name="menu_award">兑奖</string>
<string name="menu_order">订单</string>
<string name="menu_vip">会员</string>
<string name="menu_management">管理</string>
<string name="menu_help">帮助</string>
<string name="title_activity_member_manage">MemberManageActivity</string>
<!--临库查询界面-->
<string name="other_selcet_meun">临库查询</string>
......@@ -464,5 +457,37 @@
<string name="gift_add_confirm">马上换购</string>
<string name="gift_sku_price">原价</string>
<!-- 菜单POS -->
<string name="menu_cashier">收银</string>
<string name="menu_service">服务</string>
<string name="menu_myself">个人</string>
<string name="menu_billing">开单</string>
<string name="menu_receivables">收款</string>
<string name="menu_vip">会员</string>
<string name="menu_recharge">充值</string>
<string name="menu_ms">营销</string>
<string name="menu_ticket">发券</string>
<string name="menu_statistics">统计</string>
<string name="menu_manager">管理</string>
<!--输入器-->
<string name="inputer_1">1</string>
<string name="inputer_2">2</string>
<string name="inputer_3">3</string>
<string name="inputer_4">4</string>
<string name="inputer_5">5</string>
<string name="inputer_6">6</string>
<string name="inputer_7">7</string>
<string name="inputer_8">8</string>
<string name="inputer_9">9</string>
<string name="inputer_0">0</string>
<string name="inputer_point">.</string>
<string name="inputer_del">删除</string>
<string name="inputer_clear">清空</string>
<string name="inputer_settle">收\n款</string>
<string name="inputer_add">+</string>
<string name="inputer_sub">-</string>
<string name="inputer_mul">×</string>
<string name="inputer_div">÷</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment