Skip to content

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

Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos 

# Conflicts:
#	app/src/main/AndroidManifest.xml
parents 2d65c276 976b49a9
Hide whitespace changes
Inline Side-by-side
Showing with 620 additions and 66 deletions
app/src/main/AndroidManifest.xml
View file @ f04be52d
......@@ -19,21 +19,17 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/main_title"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustUnspecified|stateHidden">
</activity>
android:windowSoftInputMode="adjustUnspecified|stateHidden"></activity>
<activity
android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".ui.login.LoginActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
......@@ -71,6 +67,8 @@
android:screenOrientation="portrait"
android:theme="@style/AppTheme"
android:windowSoftInputMode="adjustUnspecified|stateHidden" />
<activity android:name=".ui.help.HelpActivity" />
<activity android:name=".ui.feedback.FeedBackActivity"></activity>
</application>
</manifest>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ f04be52d
......@@ -3,8 +3,10 @@ package com.xingdata.zzdpos.db;
import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.base.BaseModel;
import com.xingdata.zzdpos.model.HandoverInfo;
import com.xingdata.zzdpos.model.Ms;
import com.xingdata.zzdpos.model.Pay;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.settle.SettlePresenter;
import java.util.ArrayList;
......@@ -19,6 +21,35 @@ import io.realm.RealmResults;
import io.realm.Sort;
public class DBFactory {
public static class Main {
/**
* 查询交班记录
*/
public static HandoverInfo queryHandoverInfo(Long operId, String date) {
return DB.getInstance().get(MainPresenter.class).where(HandoverInfo.class)
.equalTo("operId", operId)
.equalTo("date", date)
.findFirst();
}
/**
* 更改交班记录
*/
public static void updateHandoverInfo(HandoverInfo handoverInfo) {
DB.getInstance().get(MainPresenter.class).executeTransaction(new Realm.Transaction() {
@Override
public void execute(Realm realm) {
realm.copyToRealmOrUpdate(handoverInfo);
}
});
}
}
public static class Settle {
/**
* 查询支付渠道
......
app/src/main/java/com/xingdata/zzdpos/ui/feedback/FeedBackActivity.java 0 → 100644
View file @ f04be52d
package com.xingdata.zzdpos.ui.feedback;
import android.databinding.DataBindingUtil;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
import android.view.View;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.databinding.ActivityFeedBackBinding;
import com.xingdata.zzdpos.model.Feed;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
public class FeedBackActivity extends AppCompatActivity {
private ActivityFeedBackBinding mFeedBackBinding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
View root = LayoutInflater.from(this).inflate(R.layout.activity_feed_back, null);
setContentView(root);
mFeedBackBinding = DataBindingUtil.bind(root);
mFeedBackBinding.icTitle.tvTitle.setText(R.string.feedBack_hint);
mFeedBackBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
finish();
}
});
mFeedBackBinding.setTextSize("0");
mFeedBackBinding.editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
mFeedBackBinding.setTextSize(mFeedBackBinding.editText.getText().toString().length() + "");
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
}
});
mFeedBackBinding.btnSubmit.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
if (mFeedBackBinding.editText.getText().length() < 10) {
ToastUtils.showShort("请详细描述下您遇到的问题");
} else {
Feed feed = new Feed();
feed.setFeedText(mFeedBackBinding.editText.getText().toString() + "联系方式：" + mFeedBackBinding.editContactWay.getText().toString());
feed.setOpMapId(LoginPresenter.loginReturnBean.getOpMapId());
feed.setOperMobile(LoginPresenter.loginReturnBean.getOperMobile());
feed.setFeedFlag("0");
feed.setOpNameabcn(LoginPresenter.loginReturnBean.getOperName());
clickFeedOk(feed);
}
}
});
}
public void clickFeedOk(Feed feed) {
ApiFactory.Feed.addFeed(feed)
.subscribe(object -> {
finish();
}, throwable -> {
ToastUtils.showShort(throwable.getMessage());
});
}
@Override
protected void onPause() {
KeyboardUtils.hideSoftInput(this);
super.onPause();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ f04be52d
......@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityMainBinding;
import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment;
import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
......@@ -29,12 +30,13 @@ import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> {
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
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;
// private List<View> views=new ArrayList<>();
private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
private HandoverDialog mHandoverDialog = new HandoverDialog();
@Override
public int getLayoutId() {
......@@ -43,7 +45,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void initView() {
mPresenter.initHandoverInfo();
List<Fragment> fragments = new ArrayList<>();
fragments.add(new CasherFragment());
fragments.add(new ServiceFragment());
......@@ -52,7 +54,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
mFragmentPagerAdapter = new FragmentViewAdapter(fragments, getSupportFragmentManager());
mViewBinding.fragmentContainer.setAdapter(mFragmentPagerAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.fragmentContainer);
initMenuBottomView();
......@@ -70,12 +71,13 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
}).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<View>() {
int i = 0;
@Override
public void accept(View view) throws Exception {
ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
itemMenuBottomBinding.text.setText(titleInts[i]);
if (i==0){
if (i == 0) {
itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color.red_guanyu));
}
itemMenuBottomBinding.img.setImageResource(iconList[i]);
......@@ -132,4 +134,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
@Override
public void showHandoverDialog() {
mHandoverDialog.show(this);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/MainContract.java
View file @ f04be52d
......@@ -17,10 +17,10 @@ interface MainContract {
// */
// void showChangePasswordDialog();
//
// /**
// * 显示交班报表页面
// */
// void showHandoverDialog();
/**
* 显示交班报表页面
*/
void showHandoverDialog();
//
// /**
// * 显示反馈页面
......@@ -507,15 +507,15 @@ interface MainContract {
// */
// public abstract void sync(SplashPresenter.SynchronousTask synchronousTask);
//
// /**
// * 初始化交班记录
// */
// public abstract void initHandoverInfo();
//
// /**
// * 交班确认
// */
// public abstract void clickHandoverOk();
/**
* 初始化交班记录
*/
public abstract void initHandoverInfo();
/**
* 交班确认
*/
public abstract void clickHandoverOk();
//
// /**
// * 点击换购确定按钮
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java
View file @ f04be52d
......@@ -12,6 +12,9 @@ import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.api.print.ZX_PrintPOS;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.HandoverInfo;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import java.text.SimpleDateFormat;
......@@ -24,11 +27,8 @@ import io.reactivex.ObservableSource;
import io.reactivex.functions.Function;
public class MainPresenter extends MainContract.Presenter {
@Override
public void onAttached() {
}
// public static HandoverInfo handoverInfo;
public static HandoverInfo handoverInfo;
//
// /**
// * 当前的使用的支付方式
......@@ -94,10 +94,10 @@ public class MainPresenter extends MainContract.Presenter {
// private ScannerUtil mScannerUtil;
//
//
// @Override
// public void onAttached() {
// this.initRealm();
//
@Override
public void onAttached() {
this.initRealm();
// mVip = Vip.createDefault();
// mCartProducts = new ArrayList<>();
// mOrderInfo = new Saleorder();
......@@ -114,8 +114,8 @@ public class MainPresenter extends MainContract.Presenter {
// this.getPayChannels();
// //获取营销活动信息
// this.getMsList();
// }
//
}
// @Override
// public void clickLock() {
// mView.goLockActivity();
......@@ -869,28 +869,28 @@ public class MainPresenter extends MainContract.Presenter {
// }
//
//
// @Override
// public void initHandoverInfo() {
// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
// String time = TimeUtils.millis2String(System.currentTimeMillis(), simpleDateFormat);
// handoverInfo = DBFactory.Main.queryHandoverInfo(LoginPresenter.loginReturnBean.getOperId
// (), time);
// if (handoverInfo == null) {
// handoverInfo = new HandoverInfo();
// handoverInfo.setId(Long.valueOf(LoginPresenter.loginReturnBean.getOperId() + time));
// handoverInfo.setDate(time);
// handoverInfo.setOperId(LoginPresenter.loginReturnBean.getOperId());
// handoverInfo.setAlipay(0L);
// handoverInfo.setPos(0L);
// handoverInfo.setCash(0L);
// handoverInfo.setFinallyAmt(0L);
// handoverInfo.setSumOrder(0L);
// handoverInfo.setVip(0L);
// handoverInfo.setWechat(0L);
// DBFactory.Main.updateHandoverInfo(handoverInfo);
// }
// }
//
@Override
public void initHandoverInfo() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd", Locale.getDefault());
String time = TimeUtils.millis2String(System.currentTimeMillis(), simpleDateFormat);
handoverInfo = DBFactory.Main.queryHandoverInfo(LoginPresenter.loginReturnBean.getOperId
(), time);
if (handoverInfo == null) {
handoverInfo = new HandoverInfo();
handoverInfo.setId(Long.valueOf(LoginPresenter.loginReturnBean.getOperId() + time));
handoverInfo.setDate(time);
handoverInfo.setOperId(LoginPresenter.loginReturnBean.getOperId());
handoverInfo.setAlipay(0L);
handoverInfo.setPos(0L);
handoverInfo.setCash(0L);
handoverInfo.setFinallyAmt(0L);
handoverInfo.setSumOrder(0L);
handoverInfo.setVip(0L);
handoverInfo.setWechat(0L);
DBFactory.Main.updateHandoverInfo(handoverInfo);
}
}
// /**
// * 更新交班信息
// */
......@@ -929,14 +929,14 @@ public class MainPresenter extends MainContract.Presenter {
// getRealm().copyToRealmOrUpdate(handoverInfo);
// getRealm().commitTransaction();
// }
//
//
// @Override
// public void clickHandoverOk() {
@Override
public void clickHandoverOk() {
// logout();
// mView.handoverOk();
// }
//
}
// @Override
// public void clickFeedOk(Feed feed) {
// ApiFactory.Feed.addFeed(feed)
......
app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/HandoverDialog.java 0 → 100644
View file @ f04be52d
package com.xingdata.zzdpos.ui.main.dialog;
import android.view.View;
import com.blankj.utilcode.util.TimeUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.databinding.DialogHandoverBinding;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
/**
* 交班页面
*/
public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBinding> {
@Override
public int getLayoutId() {
return R.layout.dialog_handover;
}
@Override
public int getTitle() {
return R.string.handover_title;
}
@Override
public void onConfirmClick(View view) {
super.onConfirmClick(view);
mPresenter.clickHandoverOk();
}
@Override
public void initView() {
if (MainPresenter.handoverInfo == null) {
mPresenter.initHandoverInfo();
}
mViewBinding.setOperName(LoginPresenter.loginReturnBean.getOperName());
mViewBinding.setDate(TimeUtils.getNowString());
mViewBinding.setAlipay(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getAlipay(), true));
mViewBinding.setWechat(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getWechat(), true));
mViewBinding.setCash(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getCash(), true));
mViewBinding.setVipPay(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getVip(), true));
mViewBinding.setBank(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getPos(), true));
mViewBinding.handoverTvSumamt.setText(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getFinallyAmt(), true));
mViewBinding.setOrderNum(String.valueOf(MainPresenter.handoverInfo.getSumOrder()));
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ f04be52d
......@@ -6,6 +6,7 @@ import android.support.v7.widget.GridLayoutManager;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
......@@ -13,7 +14,10 @@ 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 com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.util.MyMenuItemDecoration;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
......@@ -41,7 +45,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
integers.add(106);
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(),5,getResources().getColor(R.color.gray_kongming)));
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......@@ -68,5 +72,18 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
}
}
});
mViewBinding.tvPayment.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.startActivity(getActivity(), PaymentActivity.class);
}
});
mViewBinding.tvSplash.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.startActivity(getActivity(), SplashActivity.class);
}
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java
View file @ f04be52d
......@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMyselfBinding;
import com.xingdata.zzdpos.ui.announcement.AnnouncementActivity;
import com.xingdata.zzdpos.ui.feedback.FeedBackActivity;
import com.xingdata.zzdpos.ui.help.HelpActivity;
import com.xingdata.zzdpos.ui.main.MainPresenter;
......@@ -51,7 +52,7 @@ public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBi
ActivityUtils.startActivity(getActivity(), AnnouncementActivity.class);
break;
case C.MENU.MENU_FEED://反馈
ActivityUtils.startActivity(getActivity(), FeedBackActivity.class);
break;
case C.MENU.MENU_UPDATE://升级
......
app/src/main/res/drawable/shape_transparent_round.xml 0 → 100644
View file @ f04be52d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/settle_btn_radius" />
<solid android:color="@color/gray_transparent" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_feed_back.xml 0 → 100644
View file @ f04be52d
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="textSize"
type="String"/>
</data>
<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"
android:background="@color/gray_zhouyu"
tools:context="com.xingdata.zzdpos.ui.feedback.FeedBackActivity">
<include
android:id="@+id/ic_title"
layout="@layout/title" />
<EditText
android:id="@+id/editText"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:gravity="top"
android:hint="@string/feedBack_edit_hint"
android:maxLength="101"
android:minLines="5"
app:layout_constraintTop_toBottomOf="@id/ic_title" />
<EditText
android:id="@+id/edit_contactWay"
style="@style/dialog_edit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:gravity="top"
android:hint="@string/feedBack_contactWay"
android:maxLength="22"
android:minLines="1"
android:singleLine="true"
app:layout_constraintTop_toBottomOf="@id/editText" />
<TextView
android:id="@+id/text_max"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/dp_4"
android:text="/100"
app:layout_constraintBottom_toBottomOf="@id/editText"
app:layout_constraintEnd_toEndOf="@id/editText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:text="@{textSize}"
android:textColor="@color/red_guanyu"
app:layout_constraintBottom_toBottomOf="@id/text_max"
app:layout_constraintEnd_toStartOf="@id/text_max" />
<Button
android:id="@+id/btn_submit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@drawable/red_border"
android:text="@string/feedBack_submit"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size"
app:layout_constraintTop_toBottomOf="@id/edit_contactWay" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_handover.xml 0 → 100644
View file @ f04be52d
<?xml version="1.0" encoding="utf-8"?>
<layout 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">
<data>
<variable
name="date"
type="String" />
<variable
name="operName"
type="String" />
<variable
name="orderNum"
type="String" />
<variable
name="cash"
type="String" />
<variable
name="wechat"
type="String" />
<variable
name="alipay"
type="String" />
<variable
name="bank"
type="String" />
<variable
name="vipPay"
type="String" />
</data>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusable="true"
android:focusableInTouchMode="true">
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_default"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:padding="0dp">
<TextView
android:id="@+id/handover_tv_sumamt"
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="￥9999"
android:textColor="@color/red900"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/handover_tv_sumamt_hint" />
<TextView
android:id="@+id/handover_tv_sumamt_hint"
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="实收金额"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view1"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/gray_zhouyu"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/handover_tv_sumamt" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/dp_4"
android:weightSum="2"
app:layout_constraintTop_toBottomOf="@id/view1">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_date" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_oper" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_orderNum" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_cash" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_wechat" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_alipay" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_bank" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/handover_vip" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{date}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{operName}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{orderNum}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{cash}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{wechat}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{alipay}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{bank}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:text="@{vipPay}"
android:textColor="@color/black_likui" />
</LinearLayout>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_casher.xml
View file @ f04be52d
......@@ -16,6 +16,7 @@
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
......@@ -28,7 +29,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/tv_payment"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -38,6 +41,7 @@
android:textColor="#FFF" />
<TextView
android:id="@+id/tv_splash"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -49,12 +53,26 @@
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@drawable/shape_transparent_round"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin"
android:paddingTop="@dimen/dp_4"
android:text="@string/handover_hint"
android:textColor="@color/white_caocao"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<android.support.v7.widget.RecyclerView
android:id="@+id/fragment_casher_recycler"
android:layout_marginTop="@dimen/all_padding"
android:layout_marginBottom="@dimen/all_padding"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_padding"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
app/src/main/res/values/colors.xml
View file @ f04be52d
......@@ -21,6 +21,7 @@
<!-- 全透明 -->
<color name="all_transparent">#00000000</color>
<color name="black_half">#50000000</color>
<color name="gray_transparent">#50aaaaaa</color>
<color name="black">#101010</color>
<color name="black1">#273542</color>
......
app/src/main/res/values/strings.xml
View file @ f04be52d
......@@ -521,4 +521,24 @@
<string name="help_code_hint">版本号</string>
<string name="help_word_hint">指导手册</string>
<!--反馈POS-->
<string name="feedBack_hint">意见反馈</string>
<string name="feedBack_edit_hint">您的反馈是我们前进的方向，请写下您的反馈…</string>
<string name="feedBack_contactWay">手机号/邮箱（方便我们联系您）</string>
<string name="feedBack_submit">提交反馈</string>
<!--交班POS-->
<string name="handover_hint">交班</string>
<string name="handover_finalAmt">实收金额:</string>
<string name="handover_date">交班时间:</string>
<string name="handover_oper">收银员:</string>
<string name="handover_orderNum">总订单:</string>
<string name="handover_cash">现金收款:</string>
<string name="handover_wechat">微信收款:</string>
<string name="handover_alipay">支付宝收款:</string>
<string name="handover_bank">银行卡收款:</string>
<string name="handover_vip">储值卡收款:</string>
<!--<string name="handover_vip">储值卡收款</string>-->
</resources>
app/src/main/res/values/styles.xml
View file @ f04be52d
......@@ -17,9 +17,9 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="vicescreen_textview_stlye">
......@@ -313,6 +313,7 @@
<item name="android:textSize">@dimen/et_textsize</item>
<item name="android:textColorHint">@color/hint</item>
</style>
<style name="Base.Widget.Design.TabLayout" parent="android:Widget">
<item name="tabBackground">@color/white_caocao</item>
<item name="tabIndicatorColor">#FFF</item>
......@@ -350,4 +351,10 @@
<item name="android:textSize">@dimen/all_text_size</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
<style name="textView_body_small">
<item name="android:padding">@dimen/dp_4</item>
<item name="android:textSize">@dimen/all_text_size_small</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
</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