Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 35e779d9 84ed2d09
Hide whitespace changes
Inline Side-by-side
Showing with 249 additions and 261 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ d053fdea
......@@ -447,8 +447,8 @@ public class C {
public static final String IS_NULL_INFO = "参数错误";
public static final String IS_ERR_INFO = "参数错误";
public static final String OPERATION_ERR_INFO = "操作失败";
public static final String SERVER_ERR_INFO = "服务器异常，请稍后重试";
public static final String SERVER_SQL_ERR_INFO = "服务器异常，请检查数据后重试";
public static final String SERVER_ERR_INFO = "网络异常，请稍后重试";
public static final String SERVER_SQL_ERR_INFO = "网络异常，请检查数据后重试";
public static final String LOGIN_CAN_NOT_ERR_INFO = "用户已被锁定或已注销";
}
......@@ -581,4 +581,9 @@ public class C {
public static final int ADD_SKU = 7;
public static final int SKU_EDITOR = 8;
}
public final class PAY_STATE {
public static final String PAYING = "0098";
public static final String SUCC = "0000";
}
}
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ d053fdea
package com.xingdata.zzdpos.ui.login;
import android.content.Intent;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
......@@ -22,6 +23,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.SystemUtil;
import com.xingdata.zzdpos.view.PopupWindowDownList;
import java.util.ArrayList;
......@@ -349,6 +351,39 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
return super.dispatchTouchEvent(ev);
}
int tempVolumeDown = 0;
int tempVolumeUp = 0;
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
if (mViewBinding.svMessage.getVisibility() == View.INVISIBLE) {
mViewBinding.svMessage.setVisibility(View.GONE);
} else {
tempVolumeDown++;
if (tempVolumeUp > 5) {
tempVolumeUp = 0;
}
}
} else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && tempVolumeDown == 5) {
tempVolumeUp++;
if (tempVolumeUp == 2) {
mViewBinding.tvSn.setText(getSyatemMessage());
mViewBinding.svMessage.setVisibility(View.VISIBLE);
tempVolumeDown = 0;
tempVolumeUp = 0;
}
} else {
tempVolumeDown = 0;
tempVolumeUp = 0;
}
return super.onKeyDown(keyCode, event);
}
private String getSyatemMessage() {
return "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" + SystemUtil
.getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n 程序版本号：" +
SystemUtil.getVersionName();
}
}
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java
View file @ d053fdea
......@@ -20,6 +20,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.SystemUtil;
import com.xingdata.zzdpos.view.PopupWindowDownList;
......@@ -46,7 +47,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
mViewBinding.etPwd.setInputType(InputType.TYPE_CLASS_NUMBER | InputType
.TYPE_NUMBER_VARIATION_PASSWORD);
mViewBinding.etPwd.setFilters(inputFilter);
if (SPUtils.getInstance().getInt(C.SP_KEY.IS_SHOW_SIGNUP_BTN) != 0) {
mViewBinding.tvSignUp.setVisibility
(View.INVISIBLE);
......@@ -167,6 +167,7 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
public void setPhone(String phone) {
mViewBinding.etPhone.setText(phone);
mViewBinding.etPhone.setSelection(mViewBinding.etPhone.getText().toString().length());
}
public void setErrorMsg(String tableName, String errCode, String errMsg) {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java
View file @ d053fdea
......@@ -4,29 +4,20 @@ package com.xingdata.zzdpos.ui.manage.user.fragment;
* Created by JM_DEV on 2017/12/21.
*/
import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager;
import android.view.Gravity;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.RadioButton;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentUserListBinding;
import com.xingdata.zzdpos.databinding.FragmentVipListBinding;
import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.manage.user.UserPresenter;
import com.xingdata.zzdpos.ui.manage.user.adapter.UserListAdapter;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
......@@ -56,8 +47,12 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
});
adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
adapter.setEnableLoadMore(false);
mViewBinding.searchLayout.onBack.setOnClickListener(view -> {
getActivity().finish();
mViewBinding.titleLayout.tvTitle.setText("店员管理");
mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
getActivity().finish();
}
});
mViewBinding.setOnClickListener(view -> {
switch (view.getId()) {
......@@ -72,9 +67,9 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
}
mPresenter.queryUser( mViewBinding.searchLayout.serchEditText.getText().toString().trim());
break;
case R.id.onBack:
getActivity().finish();
break;
// case R.id.onBack:
// getActivity().finish();
// break;
}
});
onRefresh();
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/ReturnTicketAdapter.java
View file @ d053fdea
......@@ -42,7 +42,7 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-mm-dd"))));
TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyyy-MM-dd"))));
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/SettlePresenter.java
View file @ d053fdea
......@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.settle;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.StringUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.api.print.ZX_PrintPOS;
import com.xingdata.zzdpos.C;
......@@ -259,10 +258,10 @@ public class SettlePresenter extends SettleContract.Presenter {
response -> {
com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(response.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
switch (r1.getResponseCode()) {
case "0000":
case C.PAY_STATE.SUCC:
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, C.PAY_CHANNEL.WECHAT)).doFinally(() -> mView.dismissLoadingDialog())));
break;
case "0098":
case C.PAY_STATE.PAYING:
mView.showPayingDialog(C.PAY_CHANNEL.WECHAT, r1);
break;
default:
......@@ -309,10 +308,10 @@ public class SettlePresenter extends SettleContract.Presenter {
.subscribe(s -> {
com.xingdata.zzdpos.api.Pay.Response r1 = JSON.parseObject(s.replace("\\", ""), com.xingdata.zzdpos.api.Pay.Response.class);
switch (r1.getResponseCode()) {
case "0000":
case C.PAY_STATE.SUCC:
subscribePay(commitOrder().flatMap(orderNo -> ApiFactory.Saleorder.addOrderPayMis(mSaleorder.pay(orderNo, payType)).doFinally(() -> mView.dismissLoadingDialog())));
break;
case "0098":
case C.PAY_STATE.PAYING:
mView.showMsg("交易处理中");
break;
default:
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java
View file @ d053fdea
......@@ -26,6 +26,7 @@ import com.xingdata.zzdpos.ui.scan.ScanFragment;
import com.xingdata.zzdpos.ui.vip.VipPresenter;
import com.xingdata.zzdpos.ui.vip.adapter.VipListAdapter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
......@@ -52,9 +53,12 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
mViewBinding.vipRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.vipRecyclerView.setAdapter(vipListAdapter);
if (vipState != 0) {
mViewBinding.titleLayout.tvTitle.setText("会员充值");
mViewBinding.vipCountAddTodayTitle.setText("充值金额");
mViewBinding.vipCountTitle.setText("今日充值");
mViewBinding.addVipLinearLayout.setVisibility(View.GONE);
}else {
mViewBinding.titleLayout.tvTitle.setText("会员管理");
}
mViewBinding.vipRefresh.setOnRefreshListener(this::onRefresh);
vipListAdapter.setOnItemClickListener((adapter, view, position) -> {
......@@ -63,8 +67,15 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
vipListAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.vipRecyclerView);
vipListAdapter.setEnableLoadMore(true);
mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
getActivity().finish();
// mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
// getActivity().finish();
// });
mViewBinding.titleLayout.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
getActivity().finish();
}
});
scanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
@Override
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ d053fdea
......@@ -28,8 +28,8 @@ public final class SystemUtil {
* @return 设备型号
*/
public static String getDeviceModel() {
// return DeviceUtils.getModel();
return "AECRC10";
return DeviceUtils.getModel();
// return "AECRC10";
}
......@@ -57,9 +57,10 @@ public final class SystemUtil {
e.printStackTrace();
}
}
// return deviceSN;
return "54849689";
return deviceSN;
// return "5484965656";
}
/**
* 获取应用名称
*
......
app/src/main/res/layout/activity_login.xml
View file @ d053fdea
......@@ -31,23 +31,47 @@
android:background="@color/appBack"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fra"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center"
android:layout_weight="8"
android:background="@color/appBack"
/>
android:layout_weight="8">
<FrameLayout
android:id="@+id/fra"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/appBack"/>
<ScrollView
android:id="@+id/sv_message"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:visibility="gone"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv_sn"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_marginTop="@dimen/margin"
android:gravity="right|bottom"
android:text="忘记密码 ？"
android:textColor="@color/black_baozheng"/>
</ScrollView>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:visibility="gone"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="gone">
<TextView
android:id="@+id/tv_company_info"
......
app/src/main/res/layout/fragment_recharge_rule_edit.xml
View file @ d053fdea
......@@ -32,10 +32,7 @@
android:text="基本信息" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -73,10 +70,7 @@
android:enabled="false" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -126,10 +120,7 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -145,10 +136,7 @@
android:text="优惠规则" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -182,10 +170,7 @@
android:text="元" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -219,10 +204,7 @@
android:text="元" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -246,11 +228,7 @@
android:gravity="center"
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -275,10 +253,7 @@
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout"/>
<RelativeLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_recharge_rule_list.xml
View file @ d053fdea
......@@ -25,12 +25,18 @@
android:layout_height="match_parent" />
</LinearLayout>
<include layout="@layout/line_layout" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_marginTop="10dp"
android:layout_height="58dp"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
......@@ -39,17 +45,17 @@
android:id="@+id/addRule"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:onClick="@{onClickListener}"
android:gravity="center_vertical"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:drawablePadding="@dimen/all_spacing"
android:layout_margin="5dp"
android:background="@mipmap/add_bg" />
android:background="@mipmap/add_bg"
android:drawablePadding="@dimen/all_spacing" />
<TextView
style="@style/default_blacktext_bigstyle"
......@@ -60,11 +66,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<include layout="@layout/line_layout" />
<RelativeLayout
......
app/src/main/res/layout/fragment_sign_in.xml
View file @ d053fdea
......@@ -119,5 +119,6 @@
android:textColor="@color/black_baozheng"/>
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_user_info_edit.xml
View file @ d053fdea
......@@ -17,16 +17,15 @@
<include
android:id="@+id/info_title"
layout="@layout/title_pop" />
<View
android:layout_marginTop="@dimen/all_margin"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -48,7 +47,7 @@
<EditText
android:id="@+id/user_name"
style="@style/dialog_edit"
style="@style/all_edittext_14sp_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -56,11 +55,7 @@
android:hint="请输入姓名" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -78,31 +73,27 @@
<EditText
android:id="@+id/user_phone"
android:digits="0123456789"
android:inputType="phone"
style="@style/dialog_edit"
android:maxLength="11"
style="@style/all_edittext_14sp_style"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@null"
android:hint="请输入手机号" />
android:digits="0123456789"
android:hint="请输入手机号"
android:inputType="phone"
android:maxLength="11" />
</LinearLayout>
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:background="@mipmap/camera" />
android:layout_margin="@dimen/all_margin_left"
android:background="@mipmap/img_boss" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -119,20 +110,15 @@
<TextView
android:id="@+id/user_Level"
android:layout_marginRight="@dimen/all_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/sp_12"
android:layout_marginRight="@dimen/all_margin"
android:drawableRight="@mipmap/ic_expand"
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -142,10 +128,10 @@
<Button
android:id="@+id/onSure"
android:layout_alignParentBottom="true"
style="@style/button_positive_noradius"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:onClick="@{onClickListener}"
android:text="确认" />
......
app/src/main/res/layout/fragment_user_list.xml
View file @ d053fdea
......@@ -11,13 +11,17 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include
android:id="@+id/title_layout"
layout="@layout/title" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center_vertical"
android:background="@drawable/up_down_line_white_bottom"
android:orientation="horizontal">
<include
......@@ -26,7 +30,6 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1" />
<TextView
android:id="@+id/userSearch"
style="@style/textView_body_small"
......@@ -35,15 +38,8 @@
android:gravity="center"
android:onClick="@{onClickListener}"
android:text="搜索" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -96,17 +92,18 @@
android:textStyle="bold" />
</LinearLayout>
<include layout="@layout/line_layout" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="10dp"
android:background="@color/line1" />
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="58dp"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
......@@ -135,10 +132,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/line1" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_vip_info.xml
View file @ d053fdea
......@@ -19,10 +19,15 @@
android:id="@+id/info_title"
layout="@layout/title_pop" />
<View
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="72dp"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
......@@ -31,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:background="@mipmap/mk_grade01" />
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
......@@ -67,15 +72,17 @@
android:text="@string/vip_info_discount" />
</LinearLayout>
<include layout="@layout/line_layout" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -166,11 +173,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/line_bg" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -187,17 +190,13 @@
<TextView
android:id="@+id/vipLevel"
style="@style/default_blacktext_nopadding_smallstyle"
android:textSize="@dimen/all_text_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -215,17 +214,11 @@
style="@style/default_blacktext_nopadding_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/all_text_size"
/>
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -245,10 +238,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin" />
<LinearLayout
......@@ -264,10 +254,7 @@
android:text="地区" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg" />
<include layout="@layout/line_layout_margin" />
<LinearLayout
android:layout_width="match_parent"
......@@ -275,13 +262,14 @@
android:layout_gravity="center_vertical"
android:background="@color/white"
android:orientation="horizontal">
<TextView
style="@style/default_blacktext_margin_16_sp_style"
android:layout_width="wrap_content"
android:text="详细地址" />
</LinearLayout>
<include layout="@layout/line_layout" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ d053fdea
......@@ -103,7 +103,7 @@
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:layout_gravity="center_vertical"
android:background="@mipmap/hd_default02" />
android:background="@mipmap/iv_vip" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_vip_level_list.xml
View file @ d053fdea
......@@ -29,7 +29,7 @@
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="58dp"
android:layout_marginTop="10dp"
android:background="@color/white"
android:gravity="center"
......
app/src/main/res/layout/fragment_vip_list.xml
View file @ d053fdea
......@@ -5,18 +5,19 @@
<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="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/title" android:id="@+id/title_layout"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white"
android:background="@drawable/up_down_line_white_bottom"
android:orientation="horizontal">
<include
......@@ -24,27 +25,25 @@
layout="@layout/title_search"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="1" />
<ImageView
android:layout_width="50dp"
android:layout_height="match_parent"
android:background="@mipmap/swipe_card_bg"/>
android:background="@mipmap/swipe_card_bg" />
<ImageView
android:id="@+id/onScan"
android:layout_width="50dp"
android:layout_height="match_parent"
android:background="@mipmap/scan_bg"
android:onClick="@{onClickListener}"/>
android:onClick="@{onClickListener}" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1"/>
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -59,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="本店会员"/>
android:text="本店会员" />
<TextView
android:id="@+id/vip_count_add_today_title"
......@@ -68,7 +67,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="今日新增"/>
android:text="今日新增" />
</LinearLayout>
<LinearLayout
......@@ -85,7 +84,7 @@
android:layout_weight="1"
android:gravity="center"
android:textSize="22sp"
android:textStyle="bold"/>
android:textStyle="bold" />
<TextView
android:id="@+id/vip_count_add_today"
......@@ -95,18 +94,23 @@
android:layout_weight="1"
android:gravity="center"
android:textSize="22sp"
android:textStyle="bold"/>
android:textStyle="bold" />
</LinearLayout>
<include layout="@layout/line_layout" />
<LinearLayout
android:id="@+id/addVipLinearLayout"
android:layout_width="match_parent"
android:layout_height="68dp"
android:layout_height="58dp"
android:layout_marginTop="10dp"
android:background="@color/white"
android:gravity="center"
android:orientation="vertical">
<include layout="@layout/line_layout" />
<LinearLayout
android:id="@+id/addVip"
android:layout_width="wrap_content"
......@@ -120,7 +124,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="5dp"
android:background="@mipmap/add_bg"/>
android:background="@mipmap/add_bg" />
<TextView
style="@style/default_blacktext_bigstyle"
......@@ -128,15 +132,11 @@
android:layout_height="wrap_content"
android:text="添加会员"
android:textColor="@color/deep_red"
android:textSize="22sp"/>
android:textSize="22sp" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_margin="@dimen/view_line_L5"
android:background="@color/line1"/>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -171,7 +171,7 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/vipRecyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_mscard_list.xml
View file @ d053fdea
......@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:background="@mipmap/mk_grade01" />
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
......@@ -65,10 +65,7 @@
android:text="@string/vip_info_discount" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
<include layout="@layout/line_layout"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -125,10 +122,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
<include layout="@layout/line_layout"/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/recharge_refresh"
......
app/src/main/res/layout/fragment_vip_recharge.xml
View file @ d053fdea
......@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:background="@mipmap/mk_grade01" />
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
......@@ -69,10 +69,13 @@
android:text="@string/vip_balance_text" />
</LinearLayout>
<include layout="@layout/line_layout" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -101,10 +104,10 @@
android:orientation="horizontal">
<LinearLayout
android:layout_weight="2"
android:id="@+id/stealLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_weight="2"
android:background="@drawable/selector_paymoney_radiobutton_bg"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -118,7 +121,6 @@
<EditText
android:id="@+id/steal_money"
android:singleLine="true"
style="@style/dialog_edit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -128,21 +130,19 @@
android:inputType="phone"
android:maxLength="6"
android:onClick="@{onClickListener}"
android:singleLine="true"
android:textCursorDrawable="@null" />
</LinearLayout>
<View
android:layout_weight="1"
android:layout_width="match_parent"
android:layout_height="1dp"/>
android:layout_height="1dp"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="5dp"
android:background="@color/line_bg"></View>
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
......@@ -193,11 +193,17 @@
</LinearLayout>
</LinearLayout>
<include layout="@layout/line_layout" />
<View
android:layout_width="wrap_content"
android:layout_height="@dimen/all_margin_left" />
<include layout="@layout/line_layout" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
......@@ -211,22 +217,24 @@
android:text="充值金额:" />
<TextView
android:text="1111111111"
android:id="@+id/rechargAMT"
style="@style/textView_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left"
android:textSize="@dimen/sbig_text_size"
android:textColor="@color/deep_red" />
android:text="1111111111"
android:textColor="@color/deep_red"
android:textSize="@dimen/sbig_text_size" />
</LinearLayout>
<include layout="@layout/line_layout" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_pay"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin_left"
android:background="@color/gray_zhouyu"
android:textAppearance="@android:style/TextAppearance.Large" />
</LinearLayout>
......
app/src/main/res/layout/fragment_vip_recharge_list.xml
View file @ d053fdea
......@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/all_margin"
android:background="@mipmap/mk_grade01" />
android:background="@mipmap/iv_vip" />
<LinearLayout
android:layout_width="match_parent"
......@@ -65,10 +65,7 @@
android:text="@string/vip_info_discount" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
<include layout="@layout/line_layout"/>
<LinearLayout
android:layout_width="match_parent"
......@@ -127,10 +124,7 @@
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/line_bg"></View>
<include layout="@layout/line_layout"/>
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/recharge_refresh"
......
app/src/main/res/layout/fragment_vip_serch.xml
View file @ d053fdea
......@@ -69,8 +69,8 @@
android:textSize="@dimen/all_text_size" />
<TextView
style="@style/textView_body"
android:id="@+id/search_ImageButton"
style="@style/textView_body"
android:layout_width="60dp"
android:layout_height="match_parent"
android:onClick="@{OnClickListener}"
......@@ -79,27 +79,10 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent" />
<include layout="@layout/line_layout" />
</android.support.constraint.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginBottom="@dimen/all_margin"
android:background="@color/gray_huanggai"
android:visibility="@{empty?View.GONE:View.VISIBLE}" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<include layout="@layout/line_layout" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_vip"
android:layout_width="match_parent"
......
app/src/main/res/layout/item_vip_group.xml
View file @ d053fdea
......@@ -13,7 +13,7 @@
<LinearLayout
android:id="@+id/cl_vip"
android:layout_width="90dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
......
app/src/main/res/layout/item_vip_list_item.xml
View file @ d053fdea
......@@ -14,7 +14,7 @@
<ImageView
android:layout_margin="@dimen/all_margin_left"
android:background="@mipmap/hd_default02"
android:background="@mipmap/iv_vip"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
......
app/src/main/res/layout/title_search.xml
View file @ d053fdea
......@@ -10,18 +10,10 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageButton
android:id="@+id/onBack"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@color/transparent"
android:padding="@dimen/all_padding"
android:src="@mipmap/go_back" />
<EditText
android:id="@+id/serchEditText"
style="@style/searchBarEditor"
......
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