Skip to content

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

Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

parents c5f79090 7e416277
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 654 additions and 537 deletions
app/build.gradle
View file @ 42be3d1b
......@@ -17,7 +17,12 @@ android {
}
buildTypes {
release {
minifyEnabled false
zipAlignEnabled true
debuggable true
//混淆编译
minifyEnabled true//打开
//移除无用的资源文件
shrinkResources true//打开
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/announcement/adapter/AnnouncementAdapter.java
View file @ 42be3d1b
......@@ -11,7 +11,10 @@ import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemAnnouncementDetailBinding;
import com.xingdata.zzdpos.model.Notice;
import com.xingdata.zzdpos.util.StringUtil;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.List;
public class AnnouncementAdapter extends BaseAdapter<Notice, ItemAnnouncementDetailBinding> {
......@@ -25,7 +28,7 @@ public class AnnouncementAdapter extends BaseAdapter<Notice, ItemAnnouncementDet
@Override
protected void convert(ItemAnnouncementDetailBinding mViewBinding, Notice item) {
mViewBinding.date.setText(TimeUtils.millis2String(item.getCreateTime()));
mViewBinding.date.setText(TimeUtils.millis2String(item.getCreateTime(), new SimpleDateFormat(StringUtil.defaultDatePattern)));
mViewBinding.title.setText(item.getNoticeTitle());
mViewBinding.body.setText(item.getNoticeDesc());
......
app/src/main/java/com/xingdata/zzdpos/ui/dialog/LoadingDialog.java
View file @ 42be3d1b
......@@ -10,8 +10,6 @@ import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.databinding.DialogLoadingBinding;
import java.util.ArrayList;
public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBinding> {
// Disposable disp;
boolean isClose = true;
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ 42be3d1b
......@@ -85,7 +85,10 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
itemMenuBottomBinding.img.setImageResource(iconList[i]);
itemMenuBottomBindings.add(itemMenuBottomBinding);
itemMenuBottomBinding.getRoot().setMinimumHeight(200);
mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
i++;
}
});
......
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ 42be3d1b
......@@ -48,7 +48,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration
(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
(getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/IntegralActivity.java
View file @ 42be3d1b
......@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.List;
......@@ -67,13 +68,13 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
@Override
public void addSucc(LoadingDialog loadingDialog) {
pop();
mPresenter.query(1, mPresenter.integralIndexFragment.NORMAL_TYPE, loadingDialog);
mPresenter.query(1, IntegralIndexFragment.NORMAL_TYPE, loadingDialog);
}
@Override
public void updateSucc(LoadingDialog loadingDialog) {
pop();
mPresenter.query(1, mPresenter.integralIndexFragment.NORMAL_TYPE, loadingDialog);
mPresenter.query(1, IntegralIndexFragment.NORMAL_TYPE, loadingDialog);
}
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java
View file @ 42be3d1b
......@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralAdapter;
import com.xingdata.zzdpos.ui.marketing.integral.adapter.IntegralExchangeAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;
......@@ -61,7 +62,6 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rvMessage.setLayoutManager(linearLayoutManager);
mViewBinding.rvMessage.setAdapter(integralAdapter);
List<Ubound> list = new ArrayList<>();
Ubound ubound = new Ubound();
ubound.setBoundValAmt(1000l);
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java
View file @ 42be3d1b
......@@ -65,7 +65,7 @@ public class MarketingMenuActivity extends AppCompatActivity {
marketingMenuAdapter = new MarketingMenuAdapter(list);
mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(linearLayoutManager.VERTICAL);
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
View file @ 42be3d1b
......@@ -39,7 +39,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("yyy-mm-dd"))));
TimeUtils.millis2String(item.getTruleExp(), new SimpleDateFormat("yyy-MM-dd"))));
mViewBinding.clSend.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ 42be3d1b
......@@ -111,14 +111,20 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
@Override
public void getOrderDetailSuss(Saleorder mSaleorder) {
mViewBinding.viewOrderDetail.getViewStub().inflate();
ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding.viewOrderDetail.getRoot());
switch (mSaleorder.getOrderStatus()) {
case 9:
viewOrderDetailBinding.tvAmtHint.setText("退货金额");
viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "退货" : mSaleorder.getSalepay().getPayName());
break;
default:
viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
}
viewOrderDetailBinding.tvAmt.setText(ConvertUtil.fenToYuan(mSaleorder.getOrderPayAmt(), true));
viewOrderDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(mSaleorder.getCreateTime()));
viewOrderDetailBinding.setOrderNo(mSaleorder.getOrderNo());
viewOrderDetailBinding.setDisAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderReduAmt(), false));
viewOrderDetailBinding.setPayType(mSaleorder.getSalepay() == null ? "未支付" : mSaleorder.getSalepay().getPayName());
viewOrderDetailBinding.setSumAmt(ConvertUtil.fenToYuan(mSaleorder.getOrderAuthAmt(), false));
viewOrderDetailBinding.setOperName(mSaleorder.getOperName());
viewOrderDetailBinding.setGoodsNum(mSaleorder.getOrderCnt() + "");
......@@ -153,12 +159,12 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消",null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
}
}).create().show();
new AlertDialog.Builder(StatisticsDetailActivity.this).setTitle("确认退货").setNegativeButton("取消", null).setPositiveButton("确认", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
mPresenter.returnOrder(mSaleorder.getOrderNo() + "");
}
}).create().show();
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ 42be3d1b
......@@ -44,9 +44,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderList("99", pageNumber, pageSize, startDate, endDate).doFinally(() -> {
mView.isShowLoading(false);
})
.subscribe(orderlist -> {
fragment.setData(orderlist, orderlist.isFirstPage());
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsOrderAdapter.java
View file @ 42be3d1b
......@@ -32,7 +32,12 @@ public class StatisticsOrderAdapter extends BaseAdapter<Saleorder, ItemStatistic
}else {
mViewBinding.tvLeftTop.setText(item.getOrderNo());
}
mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
if (item.getOrderPayAmt()>0){
mViewBinding.tvRightTop.setText("+"+item.getPayAmt());
}else {
mViewBinding.tvRightTop.setText(item.getPayAmt());
}
mViewBinding.tvLeftBottom.setText(TimeUtils.millis2String(item.getCreateTime()));
switch (item.getPayType()){
case C.PAY_CHANNEL.CASH:
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java
View file @ 42be3d1b
......@@ -49,7 +49,7 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......
app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipLevleFragment.java
View file @ 42be3d1b
......@@ -44,7 +44,7 @@ public class VipLevleFragment extends BaseFragment<VipPresenter, FragmentVipleve
* @param buttonID
*/
private void setRadioButtonChecked(int buttonID) {
RadioButton radioButton= ((RadioButton) mViewBinding.vipLevelRadioGroup.findViewById(buttonID));
RadioButton radioButton= mViewBinding.vipLevelRadioGroup.findViewById(buttonID);
if (radioButton.isChecked()){
radioButton.getPaint().setFakeBoldText(true);
radioButton.setTextSize(17);
......
app/src/main/res/drawable/selector_edit_frame_blue_background.xml 0 → 100644
View file @ 42be3d1b
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/all_transparent" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/singleline_white_gray.xml
View file @ 42be3d1b
......@@ -7,7 +7,7 @@
</shape>
</item>
<item android:bottom="1.5dp">
<item android:bottom="0.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
......
app/src/main/res/drawable/text_white_top_bottom_gray.xml 0 → 100644
View file @ 42be3d1b
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/gray_kongming"/>
</shape>
</item>
<item android:bottom="0.5dp" android:top="0.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_feed_back.xml
View file @ 42be3d1b
......@@ -5,7 +5,7 @@
<variable
name="textSize"
type="String"/>
type="String" />
</data>
......@@ -28,6 +28,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@drawable/selector_edit_frame_blue_background"
android:gravity="top"
android:hint="@string/feedBack_edit_hint"
android:maxLength="101"
......@@ -40,6 +41,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:background="@drawable/selector_edit_frame_blue_background"
android:gravity="top"
android:hint="@string/feedBack_contactWay"
android:maxLength="22"
......
app/src/main/res/layout/activity_help.xml
View file @ 42be3d1b
......@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -89,6 +89,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:autoLink="phone"
android:padding="@dimen/all_padding"
android:text="@string/help_phone" />
</LinearLayout>
......@@ -97,7 +98,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -120,7 +121,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -135,6 +136,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="right"
android:autoLink="web"
android:padding="@dimen/all_padding"
android:text="@string/help_web" />
</LinearLayout>
......
app/src/main/res/layout/activity_main.xml
View file @ 42be3d1b
......@@ -14,13 +14,15 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:elevation="@dimen/view_line_L2"
android:gravity="center_vertical|center_horizontal"
android:orientation="horizontal"
android:paddingTop="@dimen/all_padding"
app:tabIndicatorHeight="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:tabGravity="fill"
app:tabIndicatorHeight="0dp"
app:tabPaddingTop="0dp"
app:tabPaddingBottom="0dp"
app:tabPaddingEnd="0dp"
app:tabPaddingStart="0dp"
android:paddingTop="@dimen/all_padding"
app:tabSelectedTextColor="@color/red_guanyu"
app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
app:tabTextColor="@color/black_likui">
......
app/src/main/res/layout/fragment_integral_main.xml
View file @ 42be3d1b
......@@ -70,9 +70,7 @@
<RadioButton
android:id="@+id/rb_get"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/radio_select"
android:button="@null"
......@@ -87,9 +85,7 @@
<RadioButton
android:id="@+id/rb_exchange"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/radio_select"
android:button="@null"
......
app/src/main/res/layout/fragment_service.xml
View file @ 42be3d1b
......@@ -20,8 +20,7 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:elevation="@dimen/view_line_L1"
android:background="@drawable/singleline_white_gray"
android:gravity="center"
android:minHeight="?attr/actionBarSize"
android:padding="0dp"
......
app/src/main/res/layout/item_announcement_detail.xml
View file @ 42be3d1b
<?xml version="1.0" encoding="utf-8"?>
<layout >
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
......@@ -22,37 +22,37 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="@dimen/all_shape_radius"
android:layout_marginBottom="@dimen/all_padding"
android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin"
android:layout_marginBottom="@dimen/all_padding">
app:cardCornerRadius="@dimen/all_shape_radius">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingBottom="@dimen/all_margin"
>
android:paddingBottom="@dimen/all_margin">
<TextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginBottom="@dimen/all_padding"
android:layout_marginEnd="@dimen/all_padding"
android:layout_marginStart="@dimen/all_padding"
android:layout_marginTop="@dimen/all_margin"
android:text="心灵受金华路：糖库心灵受的巅峰之路！"
android:gravity="center"
android:text=""
android:textColor="@color/black_baozheng"
android:textStyle="bold" />
android:textSize="@dimen/all_text_size" />
<TextView
android:id="@+id/body"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:text="ask領導就阿喀琉斯大家阿厤克斯大家阿隆索死啦對啦開始覺得請問哦請假了受打擊啦看到解開了缺點青蛙禮金卡實力坑爹 啊就是了看到薔薇科額的擴大勢力的就喀什燈籠褲幾千萬大家拉薩大家李克强千萬快樂件大事多久啦空間的權威的來擴大是快樂的切阿德 啊時代科技千龍網的！" />
android:paddingEnd="@dimen/all_padding"
android:paddingStart="@dimen/all_padding"
android:text="" />
</LinearLayout>
</android.support.v7.widget.CardView>
......
app/src/main/res/layout/item_menu_detail.xml
View file @ 42be3d1b
......@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="0.8dp"
android:background="@color/white_caocao"
android:background="?android:attr/selectableItemBackground"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="25dp"
......
app/src/main/res/layout/item_myself_string.xml
View file @ 42be3d1b
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:padding="0dp">
<TextView
......@@ -11,16 +12,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginBottom="@dimen/all_padding"
android:background="@color/white_caocao"
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="@dimen/all_padding"
android:elevation="@dimen/view_line_L050"
android:gravity="left"
android:padding="@dimen/vicescreen_shoppingcart_pandding"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintEnd_toEndOf="@id/item_tv"
app:layout_constraintStart_toStartOf="@id/item_tv"
app:layout_constraintTop_toTopOf="@id/item_tv" />
</FrameLayout>
<View
android:layout_width="0dp"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="@id/item_tv"
app:layout_constraintEnd_toEndOf="@id/item_tv"
app:layout_constraintStart_toStartOf="@id/item_tv" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_padding"
android:background="@color/gray_zhouyu"
app:layout_constraintTop_toBottomOf="@id/item_tv"
app:layout_constraintEnd_toEndOf="@id/item_tv"
app:layout_constraintStart_toStartOf="@id/item_tv" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title.xml
View file @ 42be3d1b
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
......@@ -10,7 +10,7 @@
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@drawable/singleline_white_gray"
......@@ -31,9 +31,14 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="标题"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/big_text_size"/>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title_order.xml
View file @ 42be3d1b
......@@ -13,7 +13,8 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao">
android:background="@color/white_caocao"
>
<ImageButton
......@@ -27,19 +28,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!--<TextView-->
<!--android:id="@+id/tv_title"-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_centerInParent="true"-->
<!--android:gravity="center"-->
<!--android:text="订单记录"-->
<!--android:textColor="@color/black_baozheng"-->
<!--android:textSize="@dimen/text_secondary_title"-->
<!--app:layout_constraintBottom_toBottomOf="parent"-->
<!--app:layout_constraintEnd_toStartOf="@id/iv_right"-->
<!--app:layout_constraintStart_toEndOf="@id/iv_back"-->
<!--app:layout_constraintTop_toTopOf="parent" />-->
<EditText
android:id="@+id/ed_title"
......@@ -63,7 +52,6 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/big_text_size"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -77,8 +65,8 @@
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="@color/transparent"
android:visibility="visible"
android:src="@mipmap/ic_dates"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
......
app/src/main/res/layout/title_search.xml
View file @ 42be3d1b
......@@ -4,7 +4,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg"
android:background="@drawable/singleline_white_gray"
android:orientation="vertical">
<LinearLayout
......
app/src/main/res/layout/view_order_detail.xml
View file @ 42be3d1b
......@@ -83,7 +83,7 @@
android:gravity="center"
android:paddingBottom="@dimen/all_padding"
android:paddingTop="@dimen/all_margin"
android:text="实收金额"
android:text="订单金额"
android:textColor="@color/black_baozheng"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/values-v21/styles.xml 0 → 100644
View file @ 42be3d1b
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
<item name="android:windowSharedElementExitTransition">@android:transition/move</item>
</style>
</resources>
app/src/main/res/values/dimens.xml
View file @ 42be3d1b
......@@ -14,6 +14,7 @@
<dimen name="all_tiny_size">9sp</dimen>
<dimen name="all_title_size">26sp</dimen>
<dimen name="all_padding">10dp</dimen>
<dimen name="all_padding_left_right">15dp</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>
......@@ -23,6 +24,7 @@
<dimen name="all_textview_width">120dp</dimen>
<dimen name="big_text_size">18sp</dimen>
<dimen name="sbig_text_size">25sp</dimen>
<dimen name="all_dialog_button">40dp</dimen>
<integer name="all_top_weight">2</integer>
<integer name="all_content_weight">25</integer>
<!--RADIUS-->
......
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