Skip to content

T
TangKuPos
Commit e46d30a7 authored by 姜敏's avatar 姜敏
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b7b568dd ccaad94d
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 90 deletions
app/build.gradle
View file @ e46d30a7
......@@ -81,5 +81,7 @@ dependencies {
compile 'com.github.ybq:Android-SpinKit:1.1.0'
compile 'com.youth.banner:banner:1.4.10'
compile 'cn.jzvd:jiaozivideoplayer:6.0.0'
compile 'me.dm7.barcodescanner:zxing:1.9.8'
compile 'com.google.zxing:core:3.3.1'
compile(name: 'zx_print_library-debug', ext: 'aar')
}
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ e46d30a7
......@@ -75,7 +75,8 @@ public class DBFactory {
//skuStatus
query.equalTo("skuStatus", 0);
return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just
(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
}
/**
......@@ -100,7 +101,8 @@ public class DBFactory {
//skuStatus
query.equalTo("skuStatus", 0);
return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just
(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
}
......@@ -124,7 +126,8 @@ public class DBFactory {
* @return 商品分组
*/
public static Observable<List<Sskugrp>> querySkugrp() {
return Observable.just(DB.getInstance().get(StorePresenter.class).where(Sskugrp.class).findAll())
return Observable.just(DB.getInstance().get(StorePresenter.class).where(Sskugrp
.class).findAll())
.flatMap(sskugrps -> Observable.just(getList(sskugrps)));
}
......@@ -136,7 +139,8 @@ public class DBFactory {
* @return 商品名称
*/
public static String querySpuNameBySkuId(Long skuId) {
List<Sssku> ssskus = getList(DB.getInstance().get(StorePresenter.class).where(Sssku.class).equalTo("skuId", skuId).findAll());
List<Sssku> ssskus = getList(DB.getInstance().get(StorePresenter.class).where(Sssku
.class).equalTo("skuId", skuId).findAll());
if (ssskus.size() > 0) return ssskus.get(0).getSpuName();
else return null;
}
......@@ -152,14 +156,18 @@ public class DBFactory {
query.notEqualTo("msTools", C.MS_TYPE.GIFT);
Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo("msDateEnd", dateNow).endGroup();
Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd",
Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo
("msDateEnd", dateNow).endGroup();
String weekNow = String.valueOf(TimeUtils.getWeekIndex(TimeUtils.getNowDate()));
query.contains("msWeekPlan", weekNow);
Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo("msTimeEnd", timeNow).endGroup();
Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss",
Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo
("msTimeEnd", timeNow).endGroup();
query.equalTo("msCoustomTag", 0);
......@@ -168,6 +176,7 @@ public class DBFactory {
.flatMap(ms -> Observable.just(getList(ms)));
}
}
public static class Vip {
/**
* 查询支付渠道
......@@ -183,6 +192,7 @@ public class DBFactory {
}
}
public static class Settle {
/**
* 查询支付渠道
......@@ -198,7 +208,6 @@ public class DBFactory {
}
/**
* 查询营销活动
*
......@@ -210,14 +219,18 @@ public class DBFactory {
query.notEqualTo("msTools", C.MS_TYPE.GIFT);
Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo("msDateEnd", dateNow).endGroup();
Long dateNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("yyyyMMdd",
Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msDateBegin", dateNow).greaterThanOrEqualTo
("msDateEnd", dateNow).endGroup();
String weekNow = String.valueOf(TimeUtils.getWeekIndex(TimeUtils.getNowDate()));
query.contains("msWeekPlan", weekNow);
Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss", Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo("msTimeEnd", timeNow).endGroup();
Long timeNow = Long.valueOf(TimeUtils.getNowString(new SimpleDateFormat("HHmmss",
Locale.getDefault())));
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo
("msTimeEnd", timeNow).endGroup();
return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING))
......@@ -228,13 +241,15 @@ public class DBFactory {
public static class Marketing {
public static class Ms {
public static Observable<List<Level>> queryLevel() {
return Observable.just(DB.getInstance().get(MainPresenter.class).where(Level.class).findAll())
return Observable.just(DB.getInstance().get(MainPresenter.class).where(Level
.class).findAll())
.flatMap(levels -> Observable.just(getList(levels)));
}
}
}
public static <E extends RealmModel> List<E> getLimitList(RealmResults<E> data, int offset, int limit) {
public static <E extends RealmModel> List<E> getLimitList(RealmResults<E> data, int offset,
int limit) {
List<E> obtainList = new ArrayList<>();
Realm realm = Realm.getDefaultInstance();
if (data.size() == 0) {
......@@ -324,6 +339,15 @@ public class DBFactory {
realm.commitTransaction();
}
public static <T extends RealmObject & BaseModel> void deleteData(Class<T> tClass, String
field, String conditions) {
Realm realm = getRealm();
realm.beginTransaction();
RealmResults<T> modelLists = realm.where(tClass).equalTo(field, conditions).findAll();
modelLists.deleteAllFromRealm();
realm.commitTransaction();
}
public static Realm getRealm() {
Realm realm = Realm.getInstance(App.instance.mRealmConfig);
realm.refresh();
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java
View file @ e46d30a7
......@@ -236,17 +236,20 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
* @return
*/
private boolean isAllNull() {
boolean _isbl = false;
if (startway == 1) {
//注册创建门店
_isbl = mViewBinding.etNickname.getText().toString().isEmpty();
return !(mViewBinding.etNickname.getText().toString().isEmpty() || mViewBinding
.etMerchantsname.getText().toString().isEmpty() ||
mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
.tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
} else if (startway == 2) {
//登录后新建门店
_isbl = mViewBinding.tvNickname.getText().toString().isEmpty();
}
return !(_isbl || mViewBinding.tvMerchantsname.getText().toString().isEmpty() ||
return !(mViewBinding.tvNickname.getText().toString().isEmpty() || mViewBinding
.tvMerchantsname.getText().toString().isEmpty() ||
mViewBinding.etStorename.getText().toString().isEmpty() || mViewBinding
.tvStoredetailedaddress.getText().toString().isEmpty() || addressId == -1);
}
return false;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/splash/SplashPresenter.java
View file @ e46d30a7
......@@ -10,11 +10,6 @@ import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.SPUtils;
import com.blankj.utilcode.util.ToastUtils;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import com.xingdata.zzdpos.App;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.api.ApiFactory;
......@@ -36,6 +31,10 @@ import com.xingdata.zzdpos.util.INI;
import com.xingdata.zzdpos.util.MultiThreadDownload;
import com.xingdata.zzdpos.util.SystemUtil;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class SplashPresenter extends SplashContract.Presenter {
Handler handler = new Handler();
long apkLenth = 0;
......@@ -48,6 +47,12 @@ public class SplashPresenter extends SplashContract.Presenter {
nowPro += pro;
mView.initProgress((int) nowPro);
if (nowPro >= 100) {
DBFactory.deleteData(Oper.class, "operStatus", "9");
// DBFactory.deleteData(Sssku.class, "skuStatus", "9");
// DBFactory.deleteData(Ussku.class, "skuStatus", "9");
// DBFactory.deleteData(Ds.class, "dsStatus", "9");
// DBFactory.deleteData(Ms.class, "msStatus", "9");
// DBFactory.deleteData(Mscard.class, "cruleStatus", "9");
mView.initComplete();
}
}
......
app/src/main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
View file @ e46d30a7
......@@ -85,7 +85,7 @@ public class RecyclerViewUtil {
@Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
super.getItemOffsets(outRect, view, parent, state);
outRect.bottom = mDividerHight + 1;
outRect.top = mDividerHight + 20;
}
@Override
......@@ -109,7 +109,7 @@ public class RecyclerViewUtil {
int bottom = 0;
top = child.getBottom() + params.bottomMargin;
top = child.getTop() - params.topMargin;
bottom = top + mDividerHight;
//画分割线
mDividerDarwable.setBounds(left, top, right, bottom);
......
app/src/main/res/layout/dialog_handover.xml
View file @ e46d30a7
......@@ -90,8 +90,8 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/dp_4"
android:weightSum="2"
app:layout_constraintTop_toBottomOf="@id/view1">
......
app/src/main/res/layout/fragment_bale_edit.xml
View file @ e46d30a7
......@@ -106,7 +106,6 @@
android:onClick="@{OnClickListener}"
android:stateListAnimator="@null"
android:text="取 消"
android:textColor="@drawable/selector_gradient_gray_button_background"
android:textSize="@dimen/et_textsize"/>
<Button
......
app/src/main/res/layout/fragment_casher.xml
View file @ e46d30a7
......@@ -74,14 +74,10 @@
android:id="@+id/fragment_casher_recycler"
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:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_input_password.xml
View file @ e46d30a7
......@@ -33,24 +33,26 @@
android:src="@mipmap/login_logo"/>
<EditText
android:id="@+id/et_one_password"
style="@style/editText_new"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_pwd01"
android:drawablePadding="@dimen/all_padding"
android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
<EditText
android:id="@+id/et_two_password"
style="@style/editText_new"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:drawableLeft="@mipmap/pwd_two01"
android:drawablePadding="@dimen/all_padding"
android:ems="10"
android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword"
......
app/src/main/res/layout/fragment_inventory.xml
View file @ e46d30a7
......@@ -45,34 +45,41 @@
</LinearLayout>
<TextView
android:id="@+id/tv_count"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/all_padding"
android:text="共0人次盘库记录"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_low"
android:textStyle="bold" />
android:layout_height="match_parent">
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_product"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ll_title">
android:layout_below="@id/tv_count"
android:layout_marginTop="@dimen/Minus_padding_left_right">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_inventory"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
android:background="@color/gray_zhouyu"></android.support.v7.widget.RecyclerView>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<TextView
android:id="@+id/tv_count"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/all_padding"
android:text="共0人次盘库记录"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_low"
android:textStyle="bold" />
</RelativeLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_inventory_add.xml
View file @ e46d30a7
......@@ -144,7 +144,7 @@
android:layout_marginTop="@dimen/all_spacing"
android:contentDescription="@string/store_cart"
android:foreground="?attr/actionBarItemBackground"
android:src="@mipmap/shopping_cart" />
android:src="@mipmap/inventory_cart" />
<TextView
android:layout_width="@dimen/store_cart_count"
......
app/src/main/res/layout/fragment_replenishement.xml
View file @ e46d30a7
......@@ -51,7 +51,7 @@
<android.support.design.widget.TabLayout
android:id="@+id/tab"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabMinWidth="150dp"
app:tabTextColor="@color/black_baozheng">
......@@ -62,8 +62,8 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_margin"
android:background="@drawable/singleline_zhouyu_huanggai" />
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" />
<android.support.v4.view.ViewPager
android:id="@+id/fragment_container"
......
app/src/main/res/layout/fragment_replenishment_list.xml
View file @ e46d30a7
......@@ -15,9 +15,9 @@
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler"
android:background="@color/gray_zhouyu"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:visibility="visible">
......
app/src/main/res/layout/fragment_sign_in.xml
View file @ e46d30a7
......@@ -37,6 +37,7 @@
style="@style/editText_new"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_username1"
android:drawablePadding="@dimen/all_padding"
android:ems="10"
android:hint="@string/login_et_phone_hint"
android:inputType="phone"
......@@ -71,6 +72,7 @@
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_pwd01"
android:drawablePadding="@dimen/all_padding"
android:ems="10"
android:hint="@string/login_et_password_hint"
android:inputType="textPassword"
......
app/src/main/res/layout/fragment_sms_code.xml
View file @ e46d30a7
......@@ -41,6 +41,7 @@
style="@style/editText_new"
android:digits="1234567890"
android:drawableLeft="@mipmap/login_username1"
android:drawablePadding="@dimen/all_padding"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_et_phone_hint"
......@@ -82,6 +83,7 @@
android:layout_marginTop="@dimen/all_margin"
android:digits="1234567890"
android:drawableLeft="@mipmap/sms01"
android:drawablePadding="@dimen/all_padding"
android:ems="10"
android:hint="@string/login_smscodefragment_et_input_sms_hint"
android:inputType="phone|number"
......
app/src/main/res/layout/fragment_user_list.xml
View file @ e46d30a7
......@@ -17,11 +17,12 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:orientation="horizontal">
<include
android:id="@+id/title_search"
layout="@layout/title_search"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
......
app/src/main/res/layout/item_bale_edit.xml
View file @ e46d30a7
......@@ -13,8 +13,7 @@
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginBottom="@dimen/all_padding"
android:foreground="?android:attr/selectableItemBackground"
android:padding="@dimen/all_margin">
android:foreground="?android:attr/selectableItemBackground">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic"
......@@ -99,6 +98,7 @@
android:gravity="center"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintLeft_toRightOf="@+id/tv_money"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
app:layout_constraintEnd_toEndOf="parent">
......@@ -106,7 +106,7 @@
android:id="@+id/btn_down"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding"
android:layout_weight="1"
android:background="@color/white"
android:onClick="@{onClick}"
......@@ -136,7 +136,7 @@
android:id="@+id/btn_up"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginStart="@dimen/all_padding"
android:layout_weight="1"
android:background="@color/white"
android:onClick="@{onClick}"
......
app/src/main/res/layout/item_menu_detail.xml
View file @ e46d30a7
......@@ -11,8 +11,8 @@
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="25dp"
android:paddingTop="25dp">
android:paddingBottom="23.5dp"
android:paddingTop="23.5dp">
<ImageView
android:id="@+id/img"
......
app/src/main/res/layout/item_statistics.xml
View file @ e46d30a7
......@@ -45,12 +45,14 @@
<TextView
android:id="@+id/tv_left_top"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding_left_right"
android:paddingEnd="@dimen/all_padding"
android:text="1231231244124124"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toStartOf="@id/tv_right_top"
app:layout_constraintStart_toEndOf="@id/img_left"
app:layout_constraintTop_toTopOf="@id/img_left" />
......
app/src/main/res/layout/title_search.xml
View file @ e46d30a7
......@@ -13,22 +13,26 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="50dp"
<ImageButton
android:id="@+id/onBack"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@mipmap/go_back" />
android:background="@color/transparent"
android:padding="@dimen/all_padding"
android:src="@mipmap/go_back" />
<EditText
style="@style/editText"
android:id="@+id/serchEditText"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="0dp"
android:background="@color/gray_kongming"
android:layout_weight="1"
android:imeOptions="actionSearch"
android:hint="请输入手机号或会员姓名" />
android:layout_height="30dp"
android:layout_marginEnd="@dimen/all_padding"
android:drawablePadding="@dimen/all_padding"
android:hint="请输入手机号或会员姓名"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/layout/view_order_detail.xml
View file @ e46d30a7
......@@ -53,14 +53,17 @@
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right"
android:layout_marginStart="@dimen/all_padding_left_right"
android:layout_marginTop="@dimen/all_margin"
android:padding="@dimen/dp_4">
android:layout_marginTop="@dimen/all_margin">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:orientation="vertical">
android:orientation="vertical"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/dp_4">
<TextView
android:id="@+id/tv_amt_hint"
......
app/src/main/res/layout/view_ticket.xml
View file @ e46d30a7
......@@ -28,13 +28,16 @@
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right"
android:layout_marginStart="@dimen/all_padding_left_right"
android:layout_marginTop="@dimen/all_margin"
android:padding="@dimen/dp_4">
android:layout_marginTop="@dimen/all_margin">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
......
app/src/main/res/layout/view_vip_recharge.xml
View file @ e46d30a7
......@@ -46,13 +46,16 @@
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding_left_right"
android:layout_marginStart="@dimen/all_padding_left_right"
android:layout_marginTop="@dimen/all_margin"
android:padding="@dimen/dp_4">
android:layout_marginTop="@dimen/all_margin">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding_left_right"
android:paddingStart="@dimen/all_padding_left_right"
android:paddingTop="@dimen/dp_4"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
......
app/src/main/res/values/dimens.xml
View file @ e46d30a7
......@@ -24,6 +24,7 @@
<dimen name="all_title_size">26sp</dimen>
<dimen name="all_padding">10dp</dimen>
<dimen name="all_padding_left_right">16dp</dimen>
<dimen name="Minus_padding_left_right">-17dp</dimen>
<dimen name="all_text_size_big">22sp</dimen>
<dimen name="all_text_size_big_big">30sp</dimen>
<dimen name="all_text_size_super_big">25sp</dimen>
......
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