Skip to content

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

Merge remote-tracking branch 'origin/master'

parents eccd9d5f 4025cd2d
Hide whitespace changes
Inline Side-by-side
Showing with 239 additions and 32 deletions
app/src/main/java/com/xingdata/zzdpos/model/MarketingMenuModel.java 0 → 100644
View file @ 097f1459
package com.xingdata.zzdpos.model;
/**
* Created by Administrator on 2017/12/27.
*/
public class MarketingMenuModel {
private String MarketingMenuName;
private int MarketingMenuImg;
public String getMarketingMenuName() {
return MarketingMenuName;
}
public void setMarketingMenuName(String marketingMenuName) {
MarketingMenuName = marketingMenuName;
}
public int getMarketingMenuImg() {
return MarketingMenuImg;
}
public void setMarketingMenuImg(int marketingMenuImg) {
MarketingMenuImg = marketingMenuImg;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ 097f1459
......@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentCasherBinding;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.ui.main.adapter.MenuRecyclerAdapter;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.statistics.StatisticsActivity;
import com.xingdata.zzdpos.ui.store.StoreActivity;
......@@ -59,10 +60,12 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
break;
case C.MENU.MENU_MS://营销
ActivityUtils.startActivity(new Intent(getActivity(),
MarketingMenuActivity.class));
break;
case C.MENU.MENU_TICKET://优惠券
ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui.sendticke.SendTicketActivity.class);
ActivityUtils.startActivity(getActivity(), com.xingdata.zzdpos.ui
.sendticke.SendTicketActivity.class);
break;
case C.MENU.MENU_STATISTICS://统计
ActivityUtils.startActivity(getActivity(), StatisticsActivity.class);
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/MarketingMenuActivity.java
View file @ 097f1459
package com.xingdata.zzdpos.ui.marketing.marketingMenu;
import android.support.v7.app.AppCompatActivity;
import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
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.R;
import com.xingdata.zzdpos.databinding.ActivityMarketingMenuBinding;
import com.xingdata.zzdpos.model.MarketingMenuModel;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter.MarketingMenuAdapter;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
public class MarketingMenuActivity extends AppCompatActivity {
MarketingMenuAdapter marketingMenuAdapter;
List<MarketingMenuModel> list = new ArrayList<>();
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_marketing_menu);
ActivityMarketingMenuBinding mViewBinding = DataBindingUtil.setContentView(
this, R.layout.activity_marketing_menu);
mViewBinding.icTitle.tvTitle.setText("营销设置");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(MarketingMenuActivity.class);
}
});
MarketingMenuModel marketingMenuModel1 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel2 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel3 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel4 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel5 = new MarketingMenuModel();
MarketingMenuModel marketingMenuModel6 = new MarketingMenuModel();
marketingMenuModel1.setMarketingMenuImg(R.mipmap.vip_level);
marketingMenuModel1.setMarketingMenuName("会员等级");
marketingMenuModel2.setMarketingMenuImg(R.mipmap.integral_rules);
marketingMenuModel2.setMarketingMenuName("积分规则");
marketingMenuModel3.setMarketingMenuImg(R.mipmap.ticker_setting);
marketingMenuModel3.setMarketingMenuName("优惠券设置");
marketingMenuModel4.setMarketingMenuImg(R.mipmap.top_up_preferential);
marketingMenuModel4.setMarketingMenuName("充值优惠");
marketingMenuModel5.setMarketingMenuImg(R.mipmap.marketing_plan);
marketingMenuModel5.setMarketingMenuName("营销计划");
marketingMenuModel6.setMarketingMenuImg(R.mipmap.sms_all);
marketingMenuModel6.setMarketingMenuName("群发短信");
list.add(marketingMenuModel1);
list.add(marketingMenuModel2);
list.add(marketingMenuModel3);
list.add(marketingMenuModel4);
list.add(marketingMenuModel5);
list.add(marketingMenuModel6);
marketingMenuAdapter = new MarketingMenuAdapter(list);
mViewBinding.rvMenu.setAdapter(marketingMenuAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(linearLayoutManager.VERTICAL);
mViewBinding.rvMenu.setLayoutManager(linearLayoutManager);
marketingMenuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (position) {
case 0: {
//会员等级
}
break;
case 1: {
//积分规则
ActivityUtils.startActivity(IntegralActivity.class);
}
break;
case 2: {
//优惠券设置
ActivityUtils.startActivity(ReturnTicketActivity.class);
}
break;
case 3: {
//充值优惠
}
break;
case 4: {
//营销计划
}
break;
case 5: {
//群发短信
}
break;
default: {
}
break;
}
}
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/marketingMenu/adapter/MarketingMenuAdapter.java 0 → 100644
View file @ 097f1459
package com.xingdata.zzdpos.ui.marketing.marketingMenu.adapter;
import android.support.annotation.Nullable;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemMarketingMenuBinding;
import com.xingdata.zzdpos.model.MarketingMenuModel;
import java.util.List;
/**
* Created by Administrator on 2017/11/24.
*/
public class MarketingMenuAdapter extends BaseAdapter<MarketingMenuModel, ItemMarketingMenuBinding> {
public MarketingMenuAdapter(@Nullable List<MarketingMenuModel> data) {
super(R.layout.item_marketing_menu, data);
}
@Override
protected void convert(ItemMarketingMenuBinding mViewBinding, MarketingMenuModel item) {
mViewBinding.ivLogo.setImageResource(item.getMarketingMenuImg());
mViewBinding.tvMenuName.setText(item.getMarketingMenuName());
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerIndexFragment.java
View file @ 097f1459
......@@ -8,6 +8,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.sendticke.SendTicketActivity;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
......@@ -25,7 +26,7 @@ public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter,
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(IntegralActivity.class);
ActivityUtils.finishActivity(SendTicketActivity.class);
}
});
mViewBinding.setOnClickListener(new OnClickListener() {
......
app/src/main/res/layout/activity_marketing_menu.xml
View file @ 097f1459
<?xml version="1.0" encoding="utf-8"?>
<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"
tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
<layout>
<include
android:id="@+id/ic_title"
layout="@layout/title"
app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
<data>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_menu"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"></variable>
</data>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.xingdata.zzdpos.ui.marketing.marketingMenu.MarketingMenuActivity">
<include
android:id="@+id/ic_title"
layout="@layout/title"
app:layout_constraintBottom_toTopOf="@+id/rv_menu"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_menu"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_title"></android.support.v7.widget.RecyclerView>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_marketing_menu.xml 0 → 100644
View file @ 097f1459
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin"
android:src="@mipmap/right"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/iv"
android:padding="@dimen/all_padding">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/vip_level"/>
<TextView
android:id="@+id/tv_menu_name"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center|left"
android:padding="@dimen/all_padding"
android:text="会员等级"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title.xml
View file @ 097f1459
......@@ -5,24 +5,24 @@
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener" />
type="com.xingdata.zzdpos.util.OnClickListener"/>
</data>
<RelativeLayout 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"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@drawable/singleline_white_gray"
android:orientation="horizontal">
<ImageButton
android:id="@+id/iv_back"
android:layout_width="60dp"
android:layout_height="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@mipmap/go_back"
android:onClick="@{onClickListener}" />
android:onClick="@{onClickListener}"/>
<TextView
android:id="@+id/tv_title"
......@@ -31,7 +31,7 @@
android:layout_centerInParent="true"
android:text="标题"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title" />
android:textSize="@dimen/text_secondary_title"/>
</RelativeLayout>
......
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