Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/AndroidManifest.xml
parents 452f5847 6b9d7b05
Hide whitespace changes
Inline Side-by-side
Showing with 785 additions and 34 deletions
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ 09991eae
......@@ -14,6 +14,11 @@ public class C {
public static final int MENU_TICKET = 104;
public static final int MENU_STATISTICS = 105;
public static final int MENU_MANAGER = 106;
public static final int MENU_ANNOUNCEMENT = 107;
public static final int MENU_FEED = 108;
public static final int MENU_UPDATE = 109;
public static final int MENU_HELP = 110;
public static final int MENU_EXIT = 111;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementActivity.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.announcement;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityAnnouncementBinding;
import com.xingdata.zzdpos.ui.announcement.fragment.AnnouncementFragment;
public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, ActivityAnnouncementBinding> implements AnnouncementContract.View {
private AnnouncementFragment mAnnouncementFragment = new AnnouncementFragment();
@Override
public int getLayoutId() {
return R.layout.activity_announcement;
}
@Override
public void initView() {
// mViewBinding.imgBack.setOnClickListener(view -> {
// finish();
// });
// loadRootFragment(R.id.f_right, mAnnouncementDetailFragment, false, false);
// loadRootFragment(R.id.f_left, mAnnouncementTitleFragment, false, false);
}
//
//
// @Override
// public void showAnnouncementDetail(Notice s) {
// mAnnouncementDetailFragment.showAnnouncementDetail(s);
// }
//
// @Override
// public void loadNotice(Pager<Notice> noticePager, boolean isRefresh) {
// mAnnouncementTitleFragment.setData(noticePager, isRefresh);
// }
}
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementContract.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.announcement;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
public interface AnnouncementContract {
interface View extends BaseView {
//
// /**
// * 显示公告内容
// */
// void showAnnouncementDetail(Notice s);
// /**
// * 加载列表
// */
// void loadNotice(Pager<Notice> noticePager, boolean isRefresh);
}
abstract class Presenter extends BasePresenter<View> {
// /**
// * 初始化查询公告列表
// *
// */
// abstract void queryNoticeList();
//
// /**
// * 点击公告标题
// */
// abstract void clickTitleItem(Notice notice);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementPresenter.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.announcement;
public class AnnouncementPresenter extends AnnouncementContract.Presenter {
private int nowPageNumber = 1;
private int nowPageSize = 10;
@Override
public void onAttached() {
}
//
// @Override
// public void queryNoticeList() {
// ApiFactory.Notice.queryNotice(nowPageNumber, nowPageSize).doFinally(() -> {
//// mView.isShowLoading(false);
// })
// .subscribe(noticePager -> {
// if (noticePager.getTotalRow() == 0) {
// ToastUtils.showShort("抱歉，暂无公告");
// }
// //判断是否能加载更多
// mView.loadNotice(noticePager, nowPageNumber == 1);
// }, throwable -> {
// ToastUtils.showShort(throwable.getMessage());
// });
// }
//
// @Override
// public void clickTitleItem(Notice s) {
// mView.showAnnouncementDetail(s);
// }
//}
}
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/announcement/adapter/AnnouncementAdapter.java 0 → 100644
View file @ 09991eae
//package com.xingdata.zzdpos.ui.announcement.adapter;
//
//
//import android.support.annotation.Nullable;
//import android.view.View;
//import android.view.ViewGroup;
//
//import com.blankj.utilcode.util.TimeUtils;
//import com.xingdata.zzdhd.R;
//import com.xingdata.zzdhd.base.BaseAdapter;
//import com.xingdata.zzdhd.base.BaseViewHolder;
//import com.xingdata.zzdhd.databinding.ItemAnnouncementBinding;
//import com.xingdata.zzdhd.model.Notice;
//
//import java.util.List;
//
//public class AnnouncementAdapter extends BaseAdapter<Notice, ItemAnnouncementBinding> {
// public Integer isClickPos =0;
//
// public AnnouncementAdapter(@Nullable List<Notice> data) {
// super(R.layout.item_announcement, data);
//
// }
//
// @Override
// protected void convert(BaseViewHolder helper, Notice item) {
// if (helper.getAdapterPosition()==isClickPos){
// helper.getConvertView().findViewById(R.id.line_is_clicked).setVisibility(View.VISIBLE);
// }
//
// super.convert(helper, item);
// }
//
// @Override
// protected void convert(ItemAnnouncementBinding mViewBinding, Notice item) {
// mViewBinding.tvTitle.setText(item.getNoticeTitle());
// mViewBinding.tvDate.setText(TimeUtils.millis2String(item.getCreateTime()));
// }
//
//
// @Override
// protected View getItemView(int layoutResId, ViewGroup parent) {
// return super.getItemView(layoutResId, parent);
// }
//
//
//}
app/src/main/java/com/xingdata/zzdpos/ui/announcement/fragment/AnnouncementFragment.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.announcement.fragment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentAnnouncementBinding;
import com.xingdata.zzdpos.ui.announcement.AnnouncementPresenter;
public class AnnouncementFragment extends BaseFragment<AnnouncementPresenter, FragmentAnnouncementBinding> {
// private AnnouncementAdapter announcementAdapter;
@Override
public int getLayoutId() {
return R.layout.fragment_announcement;
}
@Override
protected boolean isLazy() {
return false;
}
@Override
public void initView() {
//
// initRecycler();
// mPresenter.queryNoticeList();
}
// private void initRecycler() {
// mViewBinding.announcementRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
// announcementAdapter = new AnnouncementAdapter(new ArrayList<>());
// announcementAdapter.bindToRecyclerView(mViewBinding.announcementRecycler);
// announcementAdapter.setOnItemClickListener((adapter, view, position) -> {
// if (announcementAdapter.isClickPos != null) {
// adapter.getViewByPosition(mViewBinding.announcementRecycler, announcementAdapter.isClickPos, R.id.line_is_clicked).setVisibility(View.INVISIBLE);
// }
// view.findViewById(R.id.line_is_clicked).setVisibility(View.VISIBLE);
// announcementAdapter.isClickPos = position;
// clickItem(announcementAdapter.getData().get(position));
// });
//
//
// }
//
//
// private void clickItem(Notice s) {
// mPresenter.clickTitleItem(s);
// }
//
//
// /**
// * 设置数据
// *
// * @param pager 数据
// * @param isRefresh 是否刷新
// */
// public void setData(Pager<Notice> pager, boolean isRefresh) {
// if (isRefresh) {
// announcementAdapter.setEnableLoadMore(true);
// mViewBinding.srlProduct.setRefreshing(false);
// }
// if (isRefresh) announcementAdapter.setNewData(pager.getList());
// else if (pager.getList().size() > 0) announcementAdapter.addData(pager.getList());
// if (pager.isLastPage()) announcementAdapter.loadMoreEnd(isRefresh);
// else announcementAdapter.loadMoreComplete();
//
// //获取第一条的公告
// if (announcementAdapter.getData() != null) {
// clickItem(announcementAdapter.getData().get(0));
// }
// }
//
}
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ 09991eae
......@@ -2,24 +2,39 @@ package com.xingdata.zzdpos.ui.main;
import android.app.Activity;
import android.databinding.DataBindingUtil;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
import android.view.View;
import com.xingdata.zzdpos.R;
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.fragment.CasherFragment;
import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment;
import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
import java.util.ArrayList;
import java.util.List;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Scheduler;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> {
private int[] titleInts={R.string.menu_cashier,R.string.menu_service,R.string.menu_myself};
private int[] iconList ={R.mipmap.icon_menu_cashier_1,R.mipmap.icon_menu_service_0,R.mipmap.icon_menu_myself_0};
private 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<>();
@Override
public int getLayoutId() {
......@@ -31,27 +46,61 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
List<Fragment> fragments = new ArrayList<>();
fragments.add(new CasherFragment());
fragments.add(new CasherFragment());
fragments.add(new CasherFragment());
fragments.add(new ServiceFragment());
fragments.add(new MyselfFragment());
mFragmentPagerAdapter = new FragmentViewAdapter(fragments, getSupportFragmentManager());
mViewBinding.fragmentContainer.setAdapter(mFragmentPagerAdapter);
mViewBinding.tabLayout.setupWithViewPager(mViewBinding.fragmentContainer);
setupTabIcons();
initMenuBottomView();
}
private void initMenuBottomView() {
Observable.create(new ObservableOnSubscribe<View>() {
@Override
public void subscribe(ObservableEmitter<View> e) throws Exception {
e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
}
}).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){
itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color.red_guanyu));
}
itemMenuBottomBinding.img.setImageResource(iconList[i]);
itemMenuBottomBindings.add(itemMenuBottomBinding);
mViewBinding.tabLayout.getTabAt(i).setCustomView(view);
i++;
}
});
mViewBinding.tabLayout.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
@Override
public void onTabSelected(TabLayout.Tab tab) {
switch (tab.getPosition()) {
case 0:
tab.setIcon(R.mipmap.icon_menu_cashier_1);
itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap.icon_menu_cashier_1);
itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R.color.red_guanyu));
break;
case 1:
tab.setIcon(R.mipmap.icon_menu_service_1);
itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap.icon_menu_service_1);
itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R.color.red_guanyu));
break;
case 2:
tab.setIcon(R.mipmap.icon_menu_myself_1);
itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap.icon_menu_myself_1);
itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R.color.red_guanyu));
break;
}
}
......@@ -60,13 +109,16 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void onTabUnselected(TabLayout.Tab tab) {
switch (tab.getPosition()) {
case 0:
tab.setIcon(R.mipmap.icon_menu_cashier_0);
itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap.icon_menu_cashier_0);
itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R.color.black_likui));
break;
case 1:
tab.setIcon(R.mipmap.icon_menu_service_0);
itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap.icon_menu_service_0);
itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R.color.black_likui));
break;
case 2:
tab.setIcon(R.mipmap.icon_menu_myself_0);
itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap.icon_menu_myself_0);
itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R.color.black_likui));
break;
}
}
......@@ -80,13 +132,4 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
}
private void setupTabIcons() {
for (int i = 0; i < 3; i++) {
mViewBinding.tabLayout.getTabAt(i).setIcon(iconList[i]).setText(titleInts[i]);
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/adapter/MySelfRecyclerAdapter.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.main.adapter;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemMyselfStringBinding;
import com.xingdata.zzdpos.databinding.ItemStringBinding;
import java.util.List;
/**
* Created by Administrator on 2017/12/21.
*/
public class MySelfRecyclerAdapter extends BaseAdapter<Integer, ItemMyselfStringBinding> {
private Context mContext;
private Integer titleId;
private Integer imgId;
public MySelfRecyclerAdapter(Context mContext, @Nullable List<Integer> integers) {
super(R.layout.item_myself_string, integers);
this.mContext = mContext;
}
@Override
protected void convert(ItemMyselfStringBinding mViewBinding, Integer item) {
switch (item) {
case C.MENU.MENU_ANNOUNCEMENT:
titleId = R.string.menu_announcement;
imgId = R.mipmap.ic_announcement;
break;
case C.MENU.MENU_FEED:
titleId = R.string.menu_feed;
imgId = R.mipmap.ic_feedback;
break;
case C.MENU.MENU_UPDATE:
titleId = R.string.menu_update;
imgId = R.mipmap.ic_upgrade;
break;
case C.MENU.MENU_HELP:
titleId = R.string.menu_help;
imgId = R.mipmap.ic_helping;
break;
case C.MENU.MENU_EXIT:
titleId = R.string.menu_exit;
imgId = R.mipmap.ic_out;
break;
}
mViewBinding.itemTv.setText(titleId);
Drawable drawable=mContext.getDrawable(imgId);
drawable.setBounds(0,0,(int)mViewBinding.itemTv.getTextSize()+20,(int)mViewBinding.itemTv.getTextSize()+20);
Drawable drawableRight=mContext.getDrawable(R.mipmap.drop_down);
drawableRight.setBounds(0,0,(int)mViewBinding.itemTv.getTextSize(),(int)mViewBinding.itemTv.getTextSize());
mViewBinding.itemTv.setCompoundDrawables(drawable,null,drawableRight,null);
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/MyselfFragment.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.main.fragment;
import android.support.v7.widget.LinearLayoutManager;
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;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentMyselfBinding;
import com.xingdata.zzdpos.ui.announcement.AnnouncementActivity;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MySelfRecyclerAdapter;
import java.util.ArrayList;
import java.util.List;
public class MyselfFragment extends BaseFragment<MainPresenter, FragmentMyselfBinding> {
private MySelfRecyclerAdapter mMySelfRecyclerAdapter;
private List<Integer> integers;
@Override
public int getLayoutId() {
return R.layout.fragment_myself;
}
@Override
public void initView() {
mViewBinding.fragmentMyselfRecycler.setLayoutManager(new LinearLayoutManager(getActivity()));
integers = new ArrayList<>();
integers.add(107);
integers.add(108);
integers.add(109);
integers.add(110);
integers.add(111);
mMySelfRecyclerAdapter = new MySelfRecyclerAdapter(getActivity(), integers);
mMySelfRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentMyselfRecycler);
// mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyItemDecoration(getActivity(), 2, R.color.black_zhangfei));
mMySelfRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch ((int) adapter.getData().get(position)) {
case C.MENU.MENU_ANNOUNCEMENT://公告
ActivityUtils.startActivity(getActivity(), AnnouncementActivity.class);
break;
case C.MENU.MENU_FEED://反馈
break;
case C.MENU.MENU_UPDATE://升级
break;
case C.MENU.MENU_HELP://帮助
break;
case C.MENU.MENU_EXIT://退出
break;
}
}
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/ServiceFragment.java 0 → 100644
View file @ 09991eae
package com.xingdata.zzdpos.ui.main.fragment;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentServiceBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import java.util.List;
public class ServiceFragment extends BaseFragment<MainPresenter,FragmentServiceBinding> {
private MenuRecyclerAdapter mMenuRecyclerAdapter;
private List<Integer> integers;
@Override
public int getLayoutId() {
return R.layout.fragment_service;
}
@Override
public void initView() {
}
}
app/src/main/res/layout/activity_announcement.xml 0 → 100644
View file @ 09991eae
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ 09991eae
......@@ -11,26 +11,39 @@
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
style="@style/Base.Widget.Design.TabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
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:layout_constraintBottom_toBottomOf="parent"
app:tabIndicatorHeight="0dp"
app:tabTextAppearance="@android:style/TextAppearance.Holo.Small">
app:tabGravity="fill"
app:tabSelectedTextColor="@color/red_guanyu"
app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
app:tabTextColor="@color/black_likui">
</android.support.design.widget.TabLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu"
app:layout_constraintTop_toTopOf="@id/tab_layout" />
<android.support.v4.view.ViewPager
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/tab_layout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0">
</android.support.v4.view.ViewPager>
......
app/src/main/res/layout/fragment_announcement.xml 0 → 100644
View file @ 09991eae
<?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">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<TextView
android:id="@+id/tv_title"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:gravity="center"
android:text="@string/announcement_meun"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/srl_product"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/all_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title">
<android.support.v7.widget.RecyclerView
android:id="@+id/announcement_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_casher.xml
View file @ 09991eae
......@@ -5,6 +5,7 @@
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.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragment layout -->
......@@ -18,7 +19,7 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/black"
android:background="@color/black_zhangfei"
android:gravity="center"
android:paddingTop="30dp"
android:weightSum="2"
......@@ -50,6 +51,8 @@
<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:background="@color/gray_zhouyu"
......
app/src/main/res/layout/fragment_myself.xml 0 → 100644
View file @ 09991eae
<layout>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragment layout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" />
<android.support.constraint.ConstraintLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@mipmap/bg_myself"
android:gravity="center"
android:paddingTop="30dp"
android:weightSum="2"
app:layout_constraintBottom_toBottomOf="@id/guideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/user_img"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="@dimen/all_margin"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderImage="@mipmap/img_head"
app:placeholderImageScaleType="centerInside"
app:roundAsCircle="true" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="@dimen/padding_medium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@mipmap/drop_down_fff"
app:layout_constraintStart_toEndOf="@id/user_img"
app:layout_constraintTop_toTopOf="parent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="李小乐"
android:textColor="@color/white_caocao"
android:textSize="@dimen/big_text_size" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_padding"
android:text="18710251009"
android:textColor="@color/white_caocao"
android:textSize="@dimen/small_text_size" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal"
android:paddingTop="@dimen/all_padding">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="北京市丰台区南四环西路186号"
android:textColor="@color/white_caocao"
android:textSize="@dimen/small_text_size" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/ic_position" />
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/drop_down_fff"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:src="@mipmap/drop_down_fff"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/fragment_myself_recycler"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/all_padding"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/gray_zhouyu"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/guideline" />
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_service.xml 0 → 100644
View file @ 09991eae
<layout>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragment layout -->
<android.support.constraint.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.38" />
<TextView
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:gravity="center"
android:minHeight="?attr/actionBarSize"
android:padding="0dp"
android:text="@string/menu_service"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/big_text_size"
app:layout_constraintTop_toTopOf="parent">
</TextView>
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
android:scrollbars="none"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tool_bar">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@mipmap/bg_service"
/>
</ScrollView>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_menu_bottom.xml 0 → 100644
View file @ 09991eae
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/img"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
/>
</LinearLayout>
</layout>
app/src/main/res/layout/item_myself_string.xml 0 → 100644
View file @ 09991eae
<?xml version="1.0" encoding="utf-8"?>
<layout>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="0dp">
<TextView
android:id="@+id/item_tv"
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: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" />
</FrameLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_string.xml
View file @ 09991eae
<?xml version="1.0" encoding="utf-8"?>
<layout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/item_tv"
android:layout_width="match_parent"
......@@ -20,6 +17,5 @@
android:textSize="14sp" />
</RelativeLayout>
</RelativeLayout>
\ No newline at end of file
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 09991eae
......@@ -16,7 +16,7 @@
<dimen name="all_text_size_super_big">25sp</dimen>
<dimen name="all_margin_left">15dp</dimen>
<dimen name="title_height">50dp</dimen>
<dimen name="small_text_size">13sp</dimen>
<dimen name="small_text_size">14sp</dimen>
<dimen name="big_text_size">18sp</dimen>
<dimen name="sbig_text_size">25sp</dimen>
<integer name="all_top_weight">2</integer>
......@@ -25,6 +25,7 @@
<dimen name="card_radius_medium">14dp</dimen>
<!--PADDING-->
<dimen name="padding_big">24dp</dimen>
<dimen name="padding_medium">16dp</dimen>
<!--EditText 边框粗细-->
<dimen name="edit_border">0.5dp</dimen>
<!--一级标题-->
......@@ -130,6 +131,7 @@
<dimen name="vicescreen_shoppingcart_pandding">10dp</dimen>
<dimen name="view_line_L1">1dp</dimen>
<dimen name="view_line_L2">2dp</dimen>
<dimen name="view_line_L050">0.5dp</dimen>
<dimen name="view_line_L5">5dp</dimen>
<dimen name="view_line_height">0.5dp</dimen>
......
app/src/main/res/values/strings.xml
View file @ 09991eae
......@@ -466,6 +466,11 @@
<string name="menu_ticket">发券</string>
<string name="menu_statistics">统计</string>
<string name="menu_manager">管理</string>
<string name="menu_announcement">公告通知</string>
<string name="menu_feed">反馈</string>
<string name="menu_update">升级</string>
<string name="menu_help">帮助</string>
<string name="menu_exit">退出</string>
<!--输入器-->
<string name="inputer_1">1</string>
<string name="inputer_2">2</string>
......
app/src/main/res/values/styles.xml
View file @ 09991eae
......@@ -305,6 +305,11 @@
<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>
<item name="tabIndicatorHeight">0dp</item>
</style>
<style name="button" parent="view_base">
<item name=" android:background">@drawable/red_border</item>
......
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